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/rm | |
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/rm')
-rwxr-xr-x | tests/rm/fail-eperm | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/tests/rm/fail-eperm b/tests/rm/fail-eperm index 4bd143ab6..8e8fbe300 100755 --- a/tests/rm/fail-eperm +++ b/tests/rm/fail-eperm @@ -24,7 +24,7 @@ use strict; my $uid = $<; # skip if root $uid == 0 - and (warn "$ME: can't run this test as root: skipping this test"), exit 77; + and CuSkip::skip "$ME: can't run this test as root: skipping this test"; my $verbose = $ENV{VERBOSE} && $ENV{VERBOSE} eq 'yes'; @@ -45,8 +45,7 @@ my $rm = "$ENV{abs_top_builddir}/src/rm"; # Untaint for upcoming popen. $rm =~ m!^([-+\@\w./]+)$! - or (warn "$ME: unusual absolute builddir name; skipping this test\n"), - exit 77; + or CuSkip::skip "$ME: unusual absolute builddir name; skipping this test\n"; $rm = $1; # Find a directory with the sticky bit set. @@ -142,17 +141,11 @@ foreach my $dir (@dir_list) } } -if ( ! $found_dir) - { - warn "$ME: couldn't find a directory with the sticky bit set;" - . " skipping this test\n"; - exit 77; - } +$found_dir + or CuSkip::skip "$ME: couldn't find a directory with the sticky bit set;" + . " skipping this test\n"; -if ( ! $found_file) - { - warn "$ME: couldn't find a file not owned by you\n" - . " in any of the following directories:\n @dir_list\n" - . "...so, skipping this test\n"; - exit 77; - } +$found_file + or CuSkip::skip "$ME: couldn't find a file not owned by you\n" + . " in any of the following directories:\n @dir_list\n" + . "...so, skipping this test\n"; |