diff options
Diffstat (limited to 'tests/ln')
| -rwxr-xr-x | tests/ln/backup-1 | 2 | ||||
| -rwxr-xr-x | tests/ln/hard-backup | 2 | ||||
| -rwxr-xr-x | tests/ln/hard-to-sym | 12 | ||||
| -rwxr-xr-x | tests/ln/misc | 50 | ||||
| -rwxr-xr-x | tests/ln/sf-1 | 4 | ||||
| -rwxr-xr-x | tests/ln/slash-decorated-nonexistent-dest | 2 | ||||
| -rwxr-xr-x | tests/ln/target-1 | 2 |
7 files changed, 37 insertions, 37 deletions
diff --git a/tests/ln/backup-1 b/tests/ln/backup-1 index 1dc72a71e..6a123e3fb 100755 --- a/tests/ln/backup-1 +++ b/tests/ln/backup-1 @@ -22,7 +22,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ ln -touch a b || framework_failure +touch a b || framework_failure_ ln b b~ || fail=1 ln -f --b=simple a b || fail=1 diff --git a/tests/ln/hard-backup b/tests/ln/hard-backup index d3bed539f..e6c9631b7 100755 --- a/tests/ln/hard-backup +++ b/tests/ln/hard-backup @@ -19,7 +19,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ ln -touch f || framework_failure +touch f || framework_failure_ ln --backup f f 2> out && fail=1 diff --git a/tests/ln/hard-to-sym b/tests/ln/hard-to-sym index 72d8e2734..64626f46c 100755 --- a/tests/ln/hard-to-sym +++ b/tests/ln/hard-to-sym @@ -22,7 +22,7 @@ print_ver_ ln # =================================================== # ensure -s silently overrides -L, -P -touch a || framework_failure +touch a || framework_failure_ ln -L -s a symlink1 || fail=1 ln -P -s symlink1 symlink2 || fail=1 ln -s -L -P symlink2 symlink3 || fail=1 @@ -34,7 +34,7 @@ ls=`ls -lG hard-to-a`x case "$ls" in *'hard-to-ax') ;; *'hard-to-a -> '*x) fail=1 ;; - *) framework_failure ;; + *) framework_failure_ ;; esac # =================================================== @@ -45,12 +45,12 @@ case "$ls" in *'hard-to-3 -> symlink2x') ;; *'hard-to-3x') fail=1 ;; *'hard-to-3 -> '*x) fail=1 ;; - *) framework_failure ;; + *) framework_failure_ ;; esac # =================================================== # Create a hard link to a dangling symlink. -ln -s /no-such-dir || framework_failure +ln -s /no-such-dir || framework_failure_ ln -L no-such-dir hard-to-dangle 2>err && fail=1 case `cat err` in *' accessing `no-such-dir'\':*) ;; @@ -60,8 +60,8 @@ ln -P no-such-dir hard-to-dangle || fail=1 # =================================================== # Create a hard link to a symlink to a directory. -mkdir d || framework_failure -ln -s d link-to-dir || framework_failure +mkdir d || framework_failure_ +ln -s d link-to-dir || framework_failure_ ln -L link-to-dir hard-to-dir-link 2>err && fail=1 case `cat err` in *': `link-to-dir'\'': hard link not allowed for directory'*) ;; diff --git a/tests/ln/misc b/tests/ln/misc index 51e97d197..454c7156f 100755 --- a/tests/ln/misc +++ b/tests/ln/misc @@ -26,60 +26,60 @@ f=tln-file # Create a simple symlink with both source and destination files # in current directory. -touch $f || framework_failure -rm -f $t || framework_failure +touch $f || framework_failure_ +rm -f $t || framework_failure_ ln -s $f $t || fail=1 test -f $t || fail=1 rm $t $f # Create a symlink with source file and explicit destination directory/file. -touch $f || framework_failure -rm -rf $d || framework_failure -mkdir $d || framework_failure +touch $f || framework_failure_ +rm -rf $d || framework_failure_ +mkdir $d || framework_failure_ ln -s ../$f $d/$t || fail=1 test -f $d/$t || fail=1 rm -rf $d $f # Create a symlink with source file and destination directory. -touch $f || framework_failure -rm -rf $d || framework_failure -mkdir $d || framework_failure +touch $f || framework_failure_ +rm -rf $d || framework_failure_ +mkdir $d || framework_failure_ ln -s ../$f $d || fail=1 test -f $d/$f || fail=1 rm -rf $d $f # See whether a trailing slash is followed too far. -touch $f || framework_failure -rm -rf $d || framework_failure -mkdir $d $d/$f || framework_failure +touch $f || framework_failure_ +rm -rf $d || framework_failure_ +mkdir $d $d/$f || framework_failure_ ln $f $d/ 2> /dev/null && fail=1 ln -s $f $d/ 2> /dev/null && fail=1 rm -rf $d $f # Make sure we get a failure with existing dest without -f option -touch $t || framework_failure +touch $t || framework_failure_ # FIXME: don't ignore the error message but rather test # it to make sure it's the right one. ln -s $t $t 2> /dev/null && fail=1 rm $t # Make sure -sf fails when src and dest are the same -touch $t || framework_failure +touch $t || framework_failure_ ln -sf $t $t 2> /dev/null && fail=1 rm $t # Create a symlink with source file and no explicit directory -rm -rf $d || framework_failure -mkdir $d || framework_failure -touch $d/$f || framework_failure +rm -rf $d || framework_failure_ +mkdir $d || framework_failure_ +touch $d/$f || framework_failure_ ln -s $d/$f || fail=1 test -f $f || fail=1 rm -rf $d $f # Create a symlink with source file and destination symlink-to-directory. -rm -rf $d $f $ld || framework_failure -touch $f || framework_failure -mkdir $d || framework_failure +rm -rf $d $f $ld || framework_failure_ +touch $f || framework_failure_ +mkdir $d || framework_failure_ ln -s $d $ld ln -s ../$f $ld || fail=1 test -f $d/$f || fail=1 @@ -87,9 +87,9 @@ rm -rf $d $f $ld # Create a symlink with source file and destination symlink-to-directory. # BUT use the new --no-dereference option. -rm -rf $d $f $ld || framework_failure -touch $f || framework_failure -mkdir $d || framework_failure +rm -rf $d $f $ld || framework_failure_ +touch $f || framework_failure_ +mkdir $d || framework_failure_ ln -s $d $ld af=`pwd`/$f ln --no-dereference -fs "$af" $ld || fail=1 @@ -98,8 +98,8 @@ rm -rf $d $f $ld # Try to create a symlink with backup where the destination file exists # and the backup file name is a hard link to the destination file. -touch a b || framework_failure -ln b b~ || framework_failure +touch a b || framework_failure_ +ln b b~ || framework_failure_ ln -f --b=simple a b || fail=1 # =================================================== @@ -108,7 +108,7 @@ ln -f --b=simple a b || fail=1 # This was fixed in 4.0.34. Broken in 4.0r. for cmd in ln cp mv ginstall; do rm -rf a x a.orig - touch a x || framework_failure + touch a x || framework_failure_ $cmd --backup=simple --suffix=.orig x a || fail=1 test -f a.orig || fail=1 done diff --git a/tests/ln/sf-1 b/tests/ln/sf-1 index d9e9123e2..db2b4306d 100755 --- a/tests/ln/sf-1 +++ b/tests/ln/sf-1 @@ -19,8 +19,8 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ ln -echo foo > a || framework_failure -ln -s . b || framework_failure +echo foo > a || framework_failure_ +ln -s . b || framework_failure_ ln -sf a b > err 2>&1 && fail=1 case `cat err` in diff --git a/tests/ln/slash-decorated-nonexistent-dest b/tests/ln/slash-decorated-nonexistent-dest index 29238451c..4716292fd 100755 --- a/tests/ln/slash-decorated-nonexistent-dest +++ b/tests/ln/slash-decorated-nonexistent-dest @@ -19,7 +19,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ ln -touch f || framework_failure +touch f || framework_failure_ # Before coreutils-7.6, this would succeed on Solaris 10 diff --git a/tests/ln/target-1 b/tests/ln/target-1 index da37e311e..3441ee0c5 100755 --- a/tests/ln/target-1 +++ b/tests/ln/target-1 @@ -24,7 +24,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ ln -mkdir d || framework_failure +mkdir d || framework_failure_ ln -s --target-dir=d ../f || fail=1 Exit $fail |