diff options
author | Jim Meyering <meyering@redhat.com> | 2011-04-28 11:12:01 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2011-04-28 22:43:56 +0200 |
commit | 156084826533bf149db7dfd2b9466ab116b4ca4b (patch) | |
tree | 058d552d9d98129eadcb8cf830551e647a13c689 /tests/misc/ls-misc | |
parent | e3f814a773cf683309271b866d69dbfa968b104a (diff) | |
download | coreutils-156084826533bf149db7dfd2b9466ab116b4ca4b.tar.xz |
tests: write skip explanation from perl scripts also to outer stderr
* tests/CuSkip.pm (skip): New file/module/function, to help
the perl test scripts "skip" a test consistently, emitting
a diagnostic both into the log file and into the outermost
stderr stream that is more likely to be seen by a human.
* tests/check.mk (TESTS_ENVIRONMENT): Add -MCuSkip.
* tests/misc/date-next-dow: Use CuSkip::skip in place of warn+exit-77.
* tests/misc/tty-eof: Likewise.
* tests/misc/uniq: Likewise.
* tests/rm/fail-eperm: Likewise.
* tests/misc/md5sum-newline: Likewise. Also, s/program_name/ME/.
* tests/misc/ls-misc (setuid_setup, main): Likewise.
* tests/misc/pwd-long: Likewise, and add -I"$abs_srcdir" -MCuSkip
to the $PERL invocation command.
Inspired by a request from Bruno Haible regarding misc/tty-eof:
http://debbugs.gnu.org/8570
Diffstat (limited to 'tests/misc/ls-misc')
-rwxr-xr-x | tests/misc/ls-misc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/misc/ls-misc b/tests/misc/ls-misc index 7c3bc7894..8b356d4ae 100755 --- a/tests/misc/ls-misc +++ b/tests/misc/ls-misc @@ -17,7 +17,7 @@ use strict; -(my $program_name = $0) =~ s|.*/||; +(my $ME = $0) =~ s|.*/||; my $prog = 'ls'; # Turn off localization of executable's output. @@ -61,8 +61,8 @@ sub setuid_setup() mkdir sticky && chmod +t sticky && $test -k sticky && mkdir owt && chmod +t,o+w owt && $test -k owt && mkdir owr && chmod o+w owr)) == 0 - or (warn "$program_name: cannot create setuid/setgid/sticky files," - . "so can't run this test\n"), exit 77; + or CuSkip::skip "$ME: cannot create setuid/setgid/sticky files," + . "so can't run this test\n"; } sub mk_file(@) @@ -285,7 +285,7 @@ my $save_temps = $ENV{SAVE_TEMPS}; my $verbose = $ENV{VERBOSE}; setuid_setup; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +my $fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); $fail and exit 1; @@ -296,5 +296,5 @@ $env =~ s/\';.*//sm; $ENV{LS_COLORS} = $env; setuid_setup; -$fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +$fail = run_tests ($ME, $prog, \@Tests, $save_temps, $verbose); exit $fail; |