diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | tests/rm/fail-eperm | 18 |
2 files changed, 17 insertions, 4 deletions
@@ -1,5 +1,8 @@ 2006-10-03 Jim Meyering <jim@meyering.net> + * tests/rm/fail-eperm: Report failure also if rm is terminated by + a signal. + * src/c99-to-c89.diff: Convert two c99'isms -- one in remove.c and one in shred.c -- that were added before coreutils-6.3. Reported by Michael Deutschmann. diff --git a/tests/rm/fail-eperm b/tests/rm/fail-eperm index 7e146d4bf..fe1e73d73 100755 --- a/tests/rm/fail-eperm +++ b/tests/rm/fail-eperm @@ -103,10 +103,20 @@ foreach my $dir (@dir_list) my $line = <RM>; close RM; - my $status = $? >> 8; - $status == 1 - or die "$ME: unexpected exit status from `$cmd';\n" - . " got $status, expected 1\n"; + my $rc = $?; + if (0x80 < $rc) + { + my $status = $rc >> 8; + $status == 1 + 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"; + } my $exp = "$rm: cannot remove `$target_file':"; $line |