diff options
| author | Jim Meyering <jim@meyering.net> | 2007-09-08 10:09:19 +0200 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-09-15 08:40:38 +0200 |
| commit | 28f1844cefb2decc05858fdf8cc62a9ef63a9a31 (patch) | |
| tree | 1ba8d121abd2b4bcf259521ce627d1d89d27cefe /tests/ls/x-option | |
| parent | 7455bf9432c0ae3664803695ddcb27613d20ca8e (diff) | |
| download | coreutils-28f1844cefb2decc05858fdf8cc62a9ef63a9a31.tar.xz | |
Convert tests/ls/, too.
Diffstat (limited to 'tests/ls/x-option')
| -rwxr-xr-x | tests/ls/x-option | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/tests/ls/x-option b/tests/ls/x-option index a0c41c24d..4fb27047c 100755 --- a/tests/ls/x-option +++ b/tests/ls/x-option @@ -21,25 +21,12 @@ if test "$VERBOSE" = yes; then ls --version fi -. $srcdir/../envvar-check . $srcdir/../lang-default +. $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 subdir || framework_failure=1 -touch subdir/b || framework_failure=1 -touch subdir/a || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +mkdir subdir || framework_failure +touch subdir/b || framework_failure +touch subdir/a || framework_failure fail=0 @@ -51,7 +38,6 @@ a b b a EOF -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 (exit $fail); exit $fail |