diff options
Diffstat (limited to 'tests/ls/no-arg')
| -rwxr-xr-x | tests/ls/no-arg | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/tests/ls/no-arg b/tests/ls/no-arg index 13f72b494..00b4d92b8 100755 --- a/tests/ls/no-arg +++ b/tests/ls/no-arg @@ -1,7 +1,7 @@ #!/bin/sh # make sure ls and `ls -R' do the right thing when invoked with no arguments. -# Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 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,36 +21,24 @@ if test "$VERBOSE" = yes; then ls --version fi -pwd=`pwd` -tmp=no-args.$$ -trap 'status=$?; cd "$pwd" && rm -rf $tmp && exit $status' 0 -trap '(exit $?); exit' 1 2 13 15 +. $srcdir/../test-lib.sh -framework_failure=0 -mkdir $tmp || framework_failure=1 -cd $tmp || framework_failure=1 -mkdir -p dir/subdir || framework_failure=1 -touch dir/subdir/file2 || framework_failure=1 -ln -s f symlink || framework_failure=1 +mkdir -p dir/subdir || framework_failure +touch dir/subdir/file2 || framework_failure +ln -s f symlink || framework_failure -cat > exp <<\EOF || framework_failure=1 +cat > exp <<\EOF || framework_failure dir exp out symlink EOF -if test $framework_failure = 1; then - echo 'failure in testing framework' - (exit 1); exit 1 -fi - fail=0 ls -1 > out || fail=1 -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 cat > exp <<\EOF .: @@ -68,7 +56,6 @@ EOF ls -R1 > out || fail=1 -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 (exit $fail); exit $fail |