diff options
Diffstat (limited to 'tests/mv')
-rwxr-xr-x | tests/mv/dup-source | 10 | ||||
-rwxr-xr-x | tests/mv/force | 2 | ||||
-rwxr-xr-x | tests/mv/i-2 | 2 | ||||
-rwxr-xr-x | tests/mv/i-3 | 2 | ||||
-rwxr-xr-x | tests/mv/mv-n | 2 | ||||
-rwxr-xr-x | tests/mv/mv-special-1 | 20 | ||||
-rwxr-xr-x | tests/mv/part-fail | 2 | ||||
-rwxr-xr-x | tests/mv/trailing-slash | 2 |
8 files changed, 21 insertions, 21 deletions
diff --git a/tests/mv/dup-source b/tests/mv/dup-source index a6a1f5cce..7a34472d8 100755 --- a/tests/mv/dup-source +++ b/tests/mv/dup-source @@ -41,9 +41,9 @@ for i in cp; do rm -fr a d; touch a; mkdir d $i --backup a a d/ 2>> out && fail=1 cat <<EOF > exp -$i: warning: source file \`a' specified more than once -$i: warning: source file \`a' specified more than once -$i: will not overwrite just-created \`d/a' with \`a' +$i: warning: source file 'a' specified more than once +$i: warning: source file 'a' specified more than once +$i: will not overwrite just-created 'd/a' with 'a' EOF compare exp out || fail=1 done @@ -56,8 +56,8 @@ for i in mv; do rm -fr a d; touch a; mkdir d $i ./a a d/ 2>> out && fail=1 cat <<EOF > exp -$i: cannot stat \`a': No such file or directory -$i: cannot stat \`a': No such file or directory +$i: cannot stat 'a': No such file or directory +$i: cannot stat 'a': No such file or directory EOF compare exp out || fail=1 done diff --git a/tests/mv/force b/tests/mv/force index d4b3a16a3..320ab563b 100755 --- a/tests/mv/force +++ b/tests/mv/force @@ -29,7 +29,7 @@ ln $ff $ff2 || framework_failure_ mv $ff $ff > out 2>&1 && fail=1 cat > exp <<EOF -mv: \`$ff' and \`$ff' are the same file +mv: '$ff' and '$ff' are the same file EOF compare exp out || fail=1 diff --git a/tests/mv/i-2 b/tests/mv/i-2 index 47eef6faf..875c72134 100755 --- a/tests/mv/i-2 +++ b/tests/mv/i-2 @@ -36,7 +36,7 @@ cp -if e f < y > out 2>&1 || fail=1 # Make sure out contains the prompt. case "`cat out`" in - "cp: try to overwrite \`f', overriding mode 0000 (---------)?"*) ;; + "cp: try to overwrite 'f', overriding mode 0000 (---------)?"*) ;; *) fail=1 ;; esac diff --git a/tests/mv/i-3 b/tests/mv/i-3 index 33176e489..1851d42d8 100755 --- a/tests/mv/i-3 +++ b/tests/mv/i-3 @@ -46,7 +46,7 @@ check_overwrite_prompt() { local delay="$1" case "`cat out`" in - "mv: try to overwrite \`g', overriding mode 0000"*) ;; + "mv: try to overwrite 'g', overriding mode 0000"*) ;; *) sleep $delay; return 1;; esac } diff --git a/tests/mv/mv-n b/tests/mv/mv-n index fff97fd9f..9a9b1156a 100755 --- a/tests/mv/mv-n +++ b/tests/mv/mv-n @@ -22,7 +22,7 @@ print_ver_ mv # test miscellaneous combinations of -f -i -n parameters touch a b || framework_failure_ -echo "\`a' -> \`b'" > out_move +echo "'a' -> 'b'" > out_move > out_empty # ask for overwrite, answer no diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1 index 64ac0ff0b..02b681e24 100755 --- a/tests/mv/mv-special-1 +++ b/tests/mv/mv-special-1 @@ -52,16 +52,16 @@ sed " " out | sort > out2 cat <<EOF | sort > exp -\`$null' -> \`XXX/$null' -\`$dir' -> \`XXX/$dir' -\`$dir/a' -> \`XXX/$dir/a' -\`$dir/a/b' -> \`XXX/$dir/a/b' -\`$dir/a/b/c' -> \`XXX/$dir/a/b/c' -\`$dir/a/b/c/file1' -> \`XXX/$dir/a/b/c/file1' -\`$dir/d' -> \`XXX/$dir/d' -\`$dir/d/e' -> \`XXX/$dir/d/e' -\`$dir/d/e/f' -> \`XXX/$dir/d/e/f' -\`$dir/d/e/f/file2' -> \`XXX/$dir/d/e/f/file2' +'$null' -> 'XXX/$null' +'$dir' -> 'XXX/$dir' +'$dir/a' -> 'XXX/$dir/a' +'$dir/a/b' -> 'XXX/$dir/a/b' +'$dir/a/b/c' -> 'XXX/$dir/a/b/c' +'$dir/a/b/c/file1' -> 'XXX/$dir/a/b/c/file1' +'$dir/d' -> 'XXX/$dir/d' +'$dir/d/e' -> 'XXX/$dir/d/e' +'$dir/d/e/f' -> 'XXX/$dir/d/e/f' +'$dir/d/e/f/file2' -> 'XXX/$dir/d/e/f/file2' EOF compare exp out2 || fail=1 diff --git a/tests/mv/part-fail b/tests/mv/part-fail index 4fe6ddc4e..ed74e02b5 100755 --- a/tests/mv/part-fail +++ b/tests/mv/part-fail @@ -38,7 +38,7 @@ printf \ # On some (less-compliant) systems, we get EPERM in this case. # Accept either diagnostic. cat <<EOF > exp2 -mv: cannot move \`k' to \`$other_partition_tmpdir/k': Permission denied +mv: cannot move 'k' to '$other_partition_tmpdir/k': Permission denied EOF if cmp out exp >/dev/null 2>&1; then diff --git a/tests/mv/trailing-slash b/tests/mv/trailing-slash index ae5079b47..5bae2f5c6 100755 --- a/tests/mv/trailing-slash +++ b/tests/mv/trailing-slash @@ -52,7 +52,7 @@ done # Test for a cp-specific diagnostic introduced after coreutils-8.7: printf '%s\n' \ - "cp: cannot create regular file \`no-such/': Not a directory" \ + "cp: cannot create regular file 'no-such/': Not a directory" \ > expected-err touch b cp b no-such/ 2> err && fail=1 |