diff options
Diffstat (limited to 'tests/mv/diag')
| -rwxr-xr-x | tests/mv/diag | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/tests/mv/diag b/tests/mv/diag index d611b91c3..d7e70f3d6 100755 --- a/tests/mv/diag +++ b/tests/mv/diag @@ -1,7 +1,7 @@ #!/bin/sh # make sure we get proper diagnostics: e.g., with --target-dir=d but no args -# Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 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 @@ -23,24 +23,11 @@ fi # Make sure we get English translations. . $srcdir/../lang-default +. $srcdir/../test-lib.sh -pwd=`pwd` -tmp=diag-$$ -trap 'status=$?; cd "$pwd" && rm -rf $tmp && exit $status' 0 -trap 'exit $?' 1 2 13 15 - -framework_failure=0 -mkdir $tmp || framework_failure=1 -cd $tmp || framework_failure=1 - -touch f1 || framework_failure=1 -touch f2 || framework_failure=1 -touch d || framework_failure=1 - -if test $framework_failure = 1; then - echo 'failure in testing framework' - exit 1 -fi +touch f1 || framework_failure +touch f2 || framework_failure +touch d || framework_failure # These mv commands should all exit nonzero. @@ -62,7 +49,7 @@ mv: target `f1' is not a directory mv: target `f2' is not a directory EOF -cmp out exp || fail=1 +compare out exp || fail=1 (exit $fail) exit $fail |