diff options
Diffstat (limited to 'tests/ls/rt-1')
| -rwxr-xr-x | tests/ls/rt-1 | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/tests/ls/rt-1 b/tests/ls/rt-1 index bf1ed955e..dce7c852d 100755 --- a/tests/ls/rt-1 +++ b/tests/ls/rt-1 @@ -1,7 +1,7 @@ #!/bin/sh # Make sure name is used as secondary key when sorting on mtime or ctime. -# Copyright (C) 1998, 2001, 2002, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 1998, 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 @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. $srcdir/../envvar-check . $srcdir/../lang-default if test "$VERBOSE" = yes; then @@ -25,25 +24,13 @@ if test "$VERBOSE" = yes; then touch --version fi -pwd=`pwd` -tmp=t-ls.$$ -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 +. $srcdir/../test-lib.sh date=1998-01-15 -touch -d "$date" c || framework_failure=1 -touch -d "$date" a || framework_failure=1 -touch -d "$date" b || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +touch -d "$date" c || framework_failure +touch -d "$date" a || framework_failure +touch -d "$date" b || framework_failure fail=0 @@ -53,8 +40,7 @@ a b c EOF -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 rm -rf out exp ls -1rt a b c > out || fail=1 @@ -63,7 +49,6 @@ c 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 |