diff options
Diffstat (limited to 'tests/rm')
-rwxr-xr-x | tests/rm/deep-1 | 2 | ||||
-rwxr-xr-x | tests/rm/empty-name | 4 | ||||
-rwxr-xr-x | tests/rm/fail-eperm | 16 | ||||
-rwxr-xr-x | tests/rm/no-give-up | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/tests/rm/deep-1 b/tests/rm/deep-1 index c3632dd62..ee7ebe338 100755 --- a/tests/rm/deep-1 +++ b/tests/rm/deep-1 @@ -38,7 +38,7 @@ k200=$k20$k20$k20$k20$k20$k20$k20$k20$k20$k20 k_deep=$k200$k200 t=t -# Create a directory in $t with lots of `k' components. +# Create a directory in $t with lots of 'k' components. deep=$t$k_deep mkdir -p $deep || fail=1 diff --git a/tests/rm/empty-name b/tests/rm/empty-name index 192a60b4b..bb8307a50 100755 --- a/tests/rm/empty-name +++ b/tests/rm/empty-name @@ -44,10 +44,10 @@ my @Tests = # test-name options input expected-output # ['empty-name-1', "''", {EXIT => 1}, - {ERR => "$prog: cannot remove `': No such file or directory\n"}], + {ERR => "$prog: cannot remove '': No such file or directory\n"}], ['empty-name-2', "a '' b", {EXIT => 1}, - {ERR => "$prog: cannot remove `': No such file or directory\n"}, + {ERR => "$prog: cannot remove '': No such file or directory\n"}, {PRE => sub { mk_file qw(a b) }}, {POST => sub {-f 'a' || -f 'b' and die "a or b remain\n" }}, ], diff --git a/tests/rm/fail-eperm b/tests/rm/fail-eperm index 0b3e6dc3e..b51cdc77c 100755 --- a/tests/rm/fail-eperm +++ b/tests/rm/fail-eperm @@ -85,7 +85,7 @@ foreach my $dir (@dir_list) # expected exit code and diagnostic. my $cmd = "$rm -f -- $target_file"; open RM, "$cmd 2>&1 |" - or die "$ME: cannot execute `$cmd'\n"; + or die "$ME: cannot execute '$cmd'\n"; my $line = <RM>; @@ -99,27 +99,27 @@ foreach my $dir (@dir_list) if ($rc == 0) { next if ! -e $target_file; - die "$ME: unexpected exit status from `$cmd';\n" + die "$ME: unexpected exit status from '$cmd';\n" . " got 0, expected 1\n"; } if (0x80 < $rc) { my $status = $rc >> 8; $status == 1 - or die "$ME: unexpected exit status from `$cmd';\n" + or die "$ME: unexpected exit status from '$cmd';\n" . " got $status, expected 1\n"; } else { # Terminated by a signal. my $sig_num = $rc & 0x7F; - die "$ME: command `$cmd' died with signal $sig_num\n"; + die "$ME: command '$cmd' died with signal $sig_num\n"; } - my $exp = "rm: cannot remove `$target_file':"; + my $exp = "rm: cannot remove '$target_file':"; $line - or die "$ME: no output from `$cmd';\n" - . "expected something like `$exp ...'\n"; + or die "$ME: no output from '$cmd';\n" + . "expected something like '$exp ...'\n"; # Transform the actual diagnostic so that it starts with "rm:". # Depending on your system, it might be "rm:" already, or @@ -128,7 +128,7 @@ foreach my $dir (@dir_list) my $regex = quotemeta $exp; $line =~ /^$regex/ - or die "$ME: unexpected diagnostic from `$cmd';\n" + or die "$ME: unexpected diagnostic from '$cmd';\n" . " got $line" . " expected $exp ...\n"; diff --git a/tests/rm/no-give-up b/tests/rm/no-give-up index 690c5b617..2644c8afc 100755 --- a/tests/rm/no-give-up +++ b/tests/rm/no-give-up @@ -29,7 +29,7 @@ chown -R $NON_ROOT_USERNAME d || framework_failure_ chmod go=x . || framework_failure_ -# This must fail, since `.' is not writable by $NON_ROOT_USERNAME. +# This must fail, since '.' is not writable by $NON_ROOT_USERNAME. setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm -rf d 2>/dev/null && fail=1 # d must remain. |