diff options
Diffstat (limited to 'tests/ls/stat-failed')
| -rwxr-xr-x | tests/ls/stat-failed | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/tests/ls/stat-failed b/tests/ls/stat-failed index 342fc2a80..02c3bf19c 100755 --- a/tests/ls/stat-failed +++ b/tests/ls/stat-failed @@ -2,7 +2,7 @@ # Verify that ls works properly when it fails to stat a file that is # not mentioned on the command line. -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006-2007 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,26 +22,13 @@ if test "$VERBOSE" = yes; then ls --version fi -. $srcdir/../envvar-check . $srcdir/../lang-default PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check +. $srcdir/../test-lib.sh -pwd=`pwd` -t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$ -trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0 -trap '(exit $?); exit $?' 1 2 13 15 - -framework_failure=0 -mkdir -p $tmp || framework_failure=1 -cd $tmp || framework_failure=1 -mkdir d || framework_failure=1 -ln -s / d/s || framework_failure=1 -chmod 600 d || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +mkdir d || framework_failure +ln -s / d/s || framework_failure +chmod 600 d || framework_failure fail=0 @@ -53,8 +40,7 @@ total 0 ?????????? ? ? ? s EOF -sed 's/^l/?/' out | cmp - exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +sed 's/^l/?/' out | compare - exp || fail=1 # Ensure that the offsets in --dired output are accurate. rm -f out exp @@ -67,7 +53,6 @@ cat <<\EOF > exp || fail=1 //DIRED-OPTIONS// --quoting-style=literal EOF -sed 's/^ l/ ?/' out | cmp - exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +sed 's/^ l/ ?/' out | compare - exp || fail=1 (exit $fail); exit $fail |