diff options
Diffstat (limited to 'tests/ls/dired')
| -rwxr-xr-x | tests/ls/dired | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/tests/ls/dired b/tests/ls/dired index 0889c973b..45cbdfcc7 100755 --- a/tests/ls/dired +++ b/tests/ls/dired @@ -1,7 +1,7 @@ #!/bin/sh # make sure --dired option works -# Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2004, 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 @@ -21,22 +21,9 @@ if test "$VERBOSE" = yes; then ls --version fi -. $srcdir/../envvar-check +. $srcdir/../test-lib.sh -pwd=`pwd` -tmp=dired.$$ -trap 'status=$?; cd "$pwd" && rm -rf $tmp && exit $status' 0 -trap '(exit $?); exit' 1 2 13 15 - -framework_failure=0 -mkdir $tmp || framework_failure=1 -cd $tmp || framework_failure=1 -mkdir dir || framework_failure=1 - -if test $framework_failure = 1; then - echo 'failure in testing framework' 1>&2 - (exit 1); exit 1 -fi +mkdir dir || framework_failure fail=0 @@ -48,7 +35,6 @@ cat <<EOF > exp //DIRED-OPTIONS// --quoting-style=literal EOF -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 (exit $fail); exit $fail |