diff options
Diffstat (limited to 'tests/ls/dangle')
| -rwxr-xr-x | tests/ls/dangle | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/tests/ls/dangle b/tests/ls/dangle index 950cd4fd6..bd3633fab 100755 --- a/tests/ls/dangle +++ b/tests/ls/dangle @@ -1,7 +1,7 @@ #!/bin/sh # Make sure ls properly handles dangling symlinks vs. ls's -L, -H, options. -# Copyright (C) 2003, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 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,11 @@ if test "$VERBOSE" = yes; then ls --version fi -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 +. $srcdir/../test-lib.sh -framework_failure=0 -mkdir -p $tmp || framework_failure=1 -cd $tmp || framework_failure=1 -ln -s no-such-file dangle || framework_failure=1 -mkdir -p dir/sub || framework_failure=1 -ln -s dir slink-to-dir || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +ln -s no-such-file dangle || framework_failure +mkdir -p dir/sub || framework_failure +ln -s dir slink-to-dir || framework_failure fail=0 @@ -59,7 +48,6 @@ sub sub EOF -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 (exit $fail); exit $fail |