diff options
Diffstat (limited to 'tests/misc/wc-files0')
| -rwxr-xr-x | tests/misc/wc-files0 | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/tests/misc/wc-files0 b/tests/misc/wc-files0 index 35da2f45f..44bf84ffe 100755 --- a/tests/misc/wc-files0 +++ b/tests/misc/wc-files0 @@ -1,7 +1,7 @@ #!/bin/sh # Show that wc's new --files0-from option works. -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 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 @@ -22,24 +22,11 @@ if test "$VERBOSE" = yes; then fi . $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 - -echo 2 > 2b || framework_failure=1 -echo 2 words > 2w || framework_failure=1 -printf '2b\n2w\n' |tr '\n' '\0' > names || framework_failure=1 - -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi +echo 2 > 2b || framework_failure +echo 2 words > 2w || framework_failure +printf '2b\n2w\n' |tr '\n' '\0' > names || framework_failure fail=0 @@ -50,15 +37,13 @@ cat <<\EOF > exp || fail=1 2 3 10 total EOF -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 if test "$fail" = ''; then # Repeat the above test, but read the file name list from stdin. rm -f out wc --files0-from=- < names > out || fail=1 - cmp out exp || fail=1 - test $fail = 1 && diff out exp 2> /dev/null + compare out exp || fail=1 fi (exit $fail); exit $fail |