summaryrefslogtreecommitdiff
path: root/tests/misc/pwd-long
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2011-04-28 11:12:01 +0200
committerJim Meyering <meyering@redhat.com>2011-04-28 22:43:56 +0200
commit156084826533bf149db7dfd2b9466ab116b4ca4b (patch)
tree058d552d9d98129eadcb8cf830551e647a13c689 /tests/misc/pwd-long
parente3f814a773cf683309271b866d69dbfa968b104a (diff)
downloadcoreutils-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/pwd-long')
-rwxr-xr-xtests/misc/pwd-long20
1 files changed, 7 insertions, 13 deletions
diff --git a/tests/misc/pwd-long b/tests/misc/pwd-long
index 7fa95abc0..3a5147d76 100755
--- a/tests/misc/pwd-long
+++ b/tests/misc/pwd-long
@@ -30,7 +30,7 @@ export ARGV_0
# Don't use CuTmpdir here, since File::Temp's use of rmtree can't
# remove the deep tree we create.
-$PERL -Tw -- - <<\EOF
+$PERL -Tw -I"$abs_srcdir" -MCuSkip -- - <<\EOF
# Show that pwd works even when the length of the resulting
# directory name is longer than PATH_MAX.
@@ -77,12 +77,9 @@ substr ($expected, 0, 1) = '';
my $i = 0;
do
{
- if (!mkdir $z, 0700)
- {
- warn "$ME: skipping this test; cannot create long directory name "
- . "at depth $i: $!\n";
- exit 77;
- }
+ mkdir $z, 0700
+ or CuSkip::skip "$ME: skipping this test; cannot create long "
+ . "directory name at depth $i: $!\n";
chdir $z
}
until (++$i == $n);
@@ -91,12 +88,9 @@ my $abs_top_builddir = $ENV{abs_top_builddir};
$abs_top_builddir
or die "$ME: envvar abs_top_builddir not defined\n";
my $build_src_dir = "$abs_top_builddir/src";
-if ($build_src_dir !~ m!^([-+.:/\w]+)$!)
- {
- warn "$ME: skipping this test; odd build source directory name:\n"
- . "$build_src_dir\n";
- exit 77;
- }
+$build_src_dir =~ m!^([-+.:/\w]+)$!
+ or CuSkip::skip "$ME: skipping this test; odd build source directory name:\n"
+ . "$build_src_dir\n";
$build_src_dir = $1;
my $pwd_binary = "$build_src_dir/pwd";