all: Undo custom exit codes #6162

BenWiederhake · 2024-03-31T21:36:53Z

This PR:

fixes the exit codes for three utils; the bulk of utils was already fixed back in all: change remaining usage codes of 2 to 1 for GNU compat #3922
fixes a weird difference in behavior of tee -h and tee --help
reduces our customization of the GNU test misc/usage_vs_getopt

All in all, we should now pass misc/usage_vs_getopt. Let's see whether CI agrees!

Ping @tertsdiepraam, you touched on this topic a long time ago. What do you think? :)

github-actions · 2024-03-31T22:06:24Z

GNU testsuite comparison:

GNU test failed: tests/ls/classify. tests/ls/classify is passing on 'main'. Maybe you have to rebase?
Skip an intermittent issue tests/tail/inotify-dir-recreate (fails in this run but passes in the 'main' branch)
Congrats! The gnu test tests/misc/usage_vs_getopt is no longer failing!
GNU test error: tests/misc/usage_vs_getopt. tests/misc/usage_vs_getopt is passing on 'main'. Maybe you have to rebase?

BenWiederhake · 2024-03-31T22:29:18Z

Hooray! It works. It also reveals yet another inconsistency in GNU ls:

$ ls --invalid
ls: unrecognized option '--invalid'
Try 'ls --help' for more information.
[$? = 2]
$ ls --classify=invalid
ls: invalid argument 'invalid' for '--classify'
Valid arguments are:
  - 'always', 'yes', 'force'
  - 'never', 'no', 'none'
  - 'auto', 'tty', 'if-tty'
Try 'ls --help' for more information.
[$? = 1]

BenWiederhake · 2024-04-01T02:42:52Z

Changes since last push:

rebased on current main
fix exit code for --classify=invalid and all other stringly-typed enum-like arguments
fix even the weirdly behaving --time-style

github-actions · 2024-04-01T03:10:33Z

GNU testsuite comparison:

Congrats! The gnu test tests/dd/nocache_eof is no longer failing!
Congrats! The gnu test tests/ls/stat-free-symlinks is no longer failing!
Congrats! The gnu test tests/misc/usage_vs_getopt is no longer failing!
Congrats! The gnu test tests/tail/inotify-rotate-resources is no longer failing!
GNU test error: tests/dd/nocache_eof. tests/dd/nocache_eof is passing on 'main'. Maybe you have to rebase?
GNU test error: tests/ls/no-cap. tests/ls/no-cap is passing on 'main'. Maybe you have to rebase?
GNU test error: tests/ls/stat-free-color. tests/ls/stat-free-color is passing on 'main'. Maybe you have to rebase?
GNU test error: tests/ls/stat-free-symlinks. tests/ls/stat-free-symlinks is passing on 'main'. Maybe you have to rebase?
GNU test error: tests/misc/usage_vs_getopt. tests/misc/usage_vs_getopt is passing on 'main'. Maybe you have to rebase?
GNU test error: tests/mv/atomic. tests/mv/atomic is passing on 'main'. Maybe you have to rebase?
GNU test error: tests/mv/atomic2. tests/mv/atomic2 is passing on 'main'. Maybe you have to rebase?
GNU test error: tests/tail/inotify-only-regular. tests/tail/inotify-only-regular is passing on 'main'. Maybe you have to rebase?
GNU test error: tests/tail/inotify-rotate-resources. tests/tail/inotify-rotate-resources is passing on 'main'. Maybe you have to rebase?

BenWiederhake · 2024-04-01T21:38:15Z

Changes since last push:

Rebased on current main
Moved some commits into ls: compute the correct exit code #6173, which was merged separately.

Locally this passes misc/usage_vs_getopt again. Let's see whether CI agrees this time! :)

github-actions · 2024-04-01T22:09:15Z

GNU testsuite comparison:

Skip an intermittent issue tests/tail/inotify-dir-recreate (fails in this run but passes in the 'main' branch)
Congrats! The gnu test tests/misc/usage_vs_getopt is no longer failing!
GNU test error: tests/misc/usage_vs_getopt. tests/misc/usage_vs_getopt is passing on 'main'. Maybe you have to rebase?

BenWiederhake · 2024-04-01T22:28:01Z

Changes since last push:

The sed invocation in util/build-gnu.sh was bad; this fixes it. In particular, the argument detection and removal still needs to be relaxed, but the problem was that it was too aggressive and accidentally removed everything. Whoops. All that in a single character!

tertsdiepraam · 2024-04-01T22:35:49Z

src/uu/tee/src/tee.rs

@@ -89,6 +89,16 @@ pub fn uu_app() -> Command {
 .override_usage(format_usage(USAGE))
 .after_help(AFTER_HELP)
 .infer_long_args(true)
+ // Since we use value-specific help texts for "--output-error", clap's "short help" and "long help" differ.


I'm not sure about this change. It's more compatible, sure, but is it better? I want to limit all sorts of edge cases in the code and might prefer disabling that test here. Or can we force the bit for --output-error to always be shown?

Note that this will be fixed by uutils-args too by the way, so maybe it just doesn't matter much either way.

(Don't consider this a blocking review)

I don't quite understand? All that this piece of code does is force the bit for --output-error to always be shown, just like you suggest.

BenWiederhake · 2024-04-01T22:44:18Z

Fancy new flake discovered in Windows CI:

Error: HttpError: request to https://api.github.com/repos/mozilla/sccache/releases/latest failed, reason: read ECONNRESET
Error: request to https://api.github.com/repos/mozilla/sccache/releases/latest failed, reason: read ECONNRESET

I guess we're (I am) making too many calls and we're getting rate-limited?

github-actions · 2024-04-01T22:53:59Z

GNU testsuite comparison:

Congrats! The gnu test tests/misc/usage_vs_getopt is no longer failing!

BenWiederhake · 2024-04-06T21:34:41Z

Changes since last push: Nothing, just a rebase to show that it still works.

@tertsdiepraam Since the code already does what you suggest (I probably misunderstand you, please clarify), I didn't change anything :)

tertsdiepraam · 2024-04-06T21:39:32Z

I wanted it by including the same text in the short help (if possible), instead of forcing the long help for the whole util. Again though, not important enough to block on.

Edit: whoops that message was borderline incomprehensible. Fixed it now.

github-actions · 2024-04-06T22:48:23Z

GNU testsuite comparison:

Skip an intermittent issue tests/tail/inotify-dir-recreate (fails in this run but passes in the 'main' branch)
Congrats! The gnu test tests/misc/usage_vs_getopt is no longer failing!

BenWiederhake · 2024-04-14T13:43:18Z

Changes since last push:

Rebased to current main, to show that it still works

Is there anything else needed?

github-actions · 2024-04-14T14:13:27Z

GNU testsuite comparison:

Skip an intermittent issue tests/tail/inotify-dir-recreate (fails in this run but passes in the 'main' branch)
Congrats! The gnu test tests/misc/usage_vs_getopt is no longer failing!
Congrats! The gnu test tests/timeout/timeout is no longer failing!

sylvestre · 2024-04-25T06:11:45Z

well done

BenWiederhake requested a review from tertsdiepraam March 31, 2024 21:36

BenWiederhake force-pushed the dev-undo-custom-exit-codes branch from 9360ec6 to 503da34 Compare April 1, 2024 02:41

BenWiederhake mentioned this pull request Apr 1, 2024

du: Parse "--time-style" only when necessary #6169

Closed

BenWiederhake marked this pull request as draft April 1, 2024 16:07

BenWiederhake mentioned this pull request Apr 1, 2024

ls: compute the correct exit code #6173

Merged

BenWiederhake marked this pull request as ready for review April 1, 2024 21:36

BenWiederhake force-pushed the dev-undo-custom-exit-codes branch from 503da34 to e4903b7 Compare April 1, 2024 21:37

BenWiederhake force-pushed the dev-undo-custom-exit-codes branch from e4903b7 to 32962b8 Compare April 1, 2024 22:25

tertsdiepraam reviewed Apr 1, 2024

View reviewed changes

BenWiederhake force-pushed the dev-undo-custom-exit-codes branch from 32962b8 to 286dc1c Compare April 6, 2024 21:33

BenWiederhake added 4 commits April 14, 2024 15:42

hostid: return correct exit code on error

f5f8cf0

pr: return correct exit code on error

9527341

tee: ensure that -h and --help are identical

3854569

util: undo custom GNU exit codes, reduce number of special cases

120f031

BenWiederhake force-pushed the dev-undo-custom-exit-codes branch from 286dc1c to 120f031 Compare April 14, 2024 13:42

sylvestre merged commit 4090d46 into uutils:main Apr 25, 2024
66 checks passed

BenWiederhake deleted the dev-undo-custom-exit-codes branch April 25, 2024 17:45

BrewTestBot mentioned this pull request Apr 27, 2024

uutils-coreutils 0.0.26 Homebrew/homebrew-core#170197

Merged

moonfruit mentioned this pull request Apr 28, 2024

uutils-selected 0.0.26 moonfruit/homebrew-tap#102

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

all: Undo custom exit codes #6162

all: Undo custom exit codes #6162

BenWiederhake commented Mar 31, 2024

github-actions bot commented Mar 31, 2024

BenWiederhake commented Mar 31, 2024

BenWiederhake commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

BenWiederhake commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

BenWiederhake commented Apr 1, 2024

tertsdiepraam Apr 1, 2024 •

edited

Loading

BenWiederhake Apr 1, 2024

BenWiederhake commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

BenWiederhake commented Apr 6, 2024

tertsdiepraam commented Apr 6, 2024 •

edited

Loading

github-actions bot commented Apr 6, 2024

BenWiederhake commented Apr 14, 2024

github-actions bot commented Apr 14, 2024

sylvestre commented Apr 25, 2024

all: Undo custom exit codes #6162

all: Undo custom exit codes #6162

Conversation

BenWiederhake commented Mar 31, 2024

github-actions bot commented Mar 31, 2024

BenWiederhake commented Mar 31, 2024

BenWiederhake commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

BenWiederhake commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

BenWiederhake commented Apr 1, 2024

tertsdiepraam Apr 1, 2024 • edited Loading

Choose a reason for hiding this comment

BenWiederhake Apr 1, 2024

Choose a reason for hiding this comment

BenWiederhake commented Apr 1, 2024

github-actions bot commented Apr 1, 2024

BenWiederhake commented Apr 6, 2024

tertsdiepraam commented Apr 6, 2024 • edited Loading

github-actions bot commented Apr 6, 2024

BenWiederhake commented Apr 14, 2024

github-actions bot commented Apr 14, 2024

sylvestre commented Apr 25, 2024

tertsdiepraam Apr 1, 2024 •

edited

Loading

tertsdiepraam commented Apr 6, 2024 •

edited

Loading