diff options
Diffstat (limited to 'tests/mv')
| -rwxr-xr-x | tests/mv/acl | 2 | ||||
| -rwxr-xr-x | tests/mv/backup-is-src | 4 | ||||
| -rwxr-xr-x | tests/mv/diag | 5 | ||||
| -rwxr-xr-x | tests/mv/dir-file | 4 | ||||
| -rwxr-xr-x | tests/mv/force | 4 | ||||
| -rwxr-xr-x | tests/mv/hard-link-1 | 4 | ||||
| -rwxr-xr-x | tests/mv/i-2 | 4 | ||||
| -rwxr-xr-x | tests/mv/i-4 | 4 | ||||
| -rwxr-xr-x | tests/mv/into-self | 4 | ||||
| -rwxr-xr-x | tests/mv/into-self-2 | 2 | ||||
| -rwxr-xr-x | tests/mv/into-self-3 | 4 | ||||
| -rwxr-xr-x | tests/mv/partition-perm | 4 | ||||
| -rwxr-xr-x | tests/mv/to-symlink | 4 |
13 files changed, 24 insertions, 25 deletions
diff --git a/tests/mv/acl b/tests/mv/acl index 8f9d565be..4fc6350b1 100755 --- a/tests/mv/acl +++ b/tests/mv/acl @@ -70,4 +70,4 @@ mv dir2 $other_partition_tmpdir || fail=1 acl2=`cd $other_partition_tmpdir && getfacl dir2` || framework_failure test "$acl1" = "$acl2" || fail=1 -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src index f8be007a8..9315d15a0 100755 --- a/tests/mv/backup-is-src +++ b/tests/mv/backup-is-src @@ -1,7 +1,7 @@ #!/bin/sh # Force mv to use the copying code. -# Copyright (C) 1998, 1999, 2000, 2004, 2007 Free Software Foundation, Inc. +# Copyright (C) 1998-2000, 2004, 2007-2008 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 @@ -48,4 +48,4 @@ EOF compare out2 exp || fail=1 -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/diag b/tests/mv/diag index d7e70f3d6..3393606c3 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-2007 Free Software Foundation, Inc. +# Copyright (C) 2000, 2004, 2006-2008 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 @@ -51,5 +51,4 @@ EOF compare out exp || fail=1 -(exit $fail) -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/dir-file b/tests/mv/dir-file index 61b7deaea..069524964 100755 --- a/tests/mv/dir-file +++ b/tests/mv/dir-file @@ -1,7 +1,7 @@ #!/bin/sh # mv must fail when src and dest are mismatched directory/non-directory. -# Copyright (C) 2000, 2006-2007 Free Software Foundation, Inc. +# Copyright (C) 2000, 2006-2008 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 @@ -32,4 +32,4 @@ fail=0 mv dir file > /dev/null 2>&1 && fail=1 mv file dir > /dev/null 2>&1 && fail=1 -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/force b/tests/mv/force index bc2603ecf..ad64c2290 100755 --- a/tests/mv/force +++ b/tests/mv/force @@ -1,7 +1,7 @@ #!/bin/sh # move a file onto itself -# Copyright (C) 1999, 2000, 2002, 2007 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2002, 2007-2008 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 @@ -44,4 +44,4 @@ test `cat $ff` = force-contents || fail=1 # device and inodes are the same. mv $ff $ff2 || fail=1 -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1 index 558cfac04..b82f2526d 100755 --- a/tests/mv/hard-link-1 +++ b/tests/mv/hard-link-1 @@ -2,7 +2,7 @@ # move a directory containing hard-linked files and # make sure the links are preserved -# Copyright (C) 1998, 1999, 2000, 2004, 2006-2007 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2004, 2006-2008 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 @@ -43,4 +43,4 @@ a=`sed -n 's/ a$//p' out` b=`sed -n 's/ b$//p' out` test "$a" = "$b" || fail=1 -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/i-2 b/tests/mv/i-2 index 49f9d985f..eb0181e1a 100755 --- a/tests/mv/i-2 +++ b/tests/mv/i-2 @@ -2,7 +2,7 @@ # Test both cp and mv for their behavior with -if and -fi # The standards (POSIX and SuS) dictate annoyingly inconsistent behavior. -# Copyright (C) 2000, 2001, 2006-2007 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2006-2008 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 @@ -58,4 +58,4 @@ test -f g || fail=1 test -f h || fail=1 compare g h || fail=1 -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/i-4 b/tests/mv/i-4 index 288c42830..db61aab86 100755 --- a/tests/mv/i-4 +++ b/tests/mv/i-4 @@ -1,7 +1,7 @@ #!/bin/sh # make sure `mv -i a b' does its job with a positive response -# Copyright (C) 2001, 2005-2007 Free Software Foundation, Inc. +# Copyright (C) 2001, 2005-2008 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 @@ -52,4 +52,4 @@ mv -i a b < y >/dev/null 2>&1 || fail=1 test -r a && fail=1 test -r b || fail=1 -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/into-self b/tests/mv/into-self index 7c2636ee9..cbe7df9c5 100755 --- a/tests/mv/into-self +++ b/tests/mv/into-self @@ -1,7 +1,7 @@ #! /bin/sh # Demonstrate how mv fails when it tries to move a directory into itself. -# Copyright (C) 1998, 1999, 2000, 2002, 2007 Free Software Foundation, Inc. +# Copyright (C) 1998-2000, 2002, 2007-2008 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 @@ -56,4 +56,4 @@ test -d $dir/$dir && fail=1 # Make sure the file has been moved to the right place. test -f $dir/$file || fail=1 -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2 index 7866e6952..ad00cb787 100755 --- a/tests/mv/into-self-2 +++ b/tests/mv/into-self-2 @@ -55,4 +55,4 @@ EOF compare out2 exp || fail=1 -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/into-self-3 b/tests/mv/into-self-3 index c8b31ff3d..ce858a234 100755 --- a/tests/mv/into-self-3 +++ b/tests/mv/into-self-3 @@ -1,7 +1,7 @@ #!/bin/sh # move a directory into itself, with a twist -# Copyright (C) 1998, 1999, 2000, 2007 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2007-2008 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 @@ -43,4 +43,4 @@ EOF compare out2 exp || fail=1 -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/partition-perm b/tests/mv/partition-perm index 7c7849947..8df9571d9 100755 --- a/tests/mv/partition-perm +++ b/tests/mv/partition-perm @@ -1,7 +1,7 @@ #!/bin/sh # Make sure permissions are preserved when moving from one partition to another. -# Copyright (C) 1999, 2000, 2001, 2006-2007 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2006-2008 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 @@ -40,4 +40,4 @@ test -f $other_partition_tmpdir/file || fail=1 mode=`ls -l $other_partition_tmpdir/file|cut -b-10` test "$mode" = "-rwxrwxrwx" || fail=1 -exit $fail +(exit $fail); exit $fail diff --git a/tests/mv/to-symlink b/tests/mv/to-symlink index 0b25ff92c..80e1d138f 100755 --- a/tests/mv/to-symlink +++ b/tests/mv/to-symlink @@ -2,7 +2,7 @@ # Make sure that the copying code used in an inter-partition # move unlinks a destination symlink before opening it. -# Copyright (C) 1999, 2000, 2007 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2007-2008 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 @@ -47,4 +47,4 @@ test -f $file && fail=1 # Make sure $rem_file is unmodified. test `cat $rem_file` = remote || fail=1 -exit $fail +(exit $fail); exit $fail |