CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-07-25 10:16:53 +02:00
Code Issues Projects Releases Wiki Activity

* tests/rm/fail-eperm: Avoid spurious differences (the error function

Browse Source 
from latest glibc no longer prints the full program_name): so don't
invoke rm via ../../src/rm.  Instead, invoke it via "PATH=../../src rm".
This commit is contained in:
Jim Meyering
2006-12-30 12:50:43 +01:00
parent 841d9a7d5d
commit 5017d1b4e1
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,5 +1,9 @@
2006-12-30 Jim Meyering <jim@meyering.net>
* tests/rm/fail-eperm: Avoid spurious differences (the error function
from latest glibc no longer prints the full program_name): so don't
invoke rm via ../../src/rm. Instead, invoke it via "PATH=../../src rm".
* tests/mv/acl (skip): Skip this test also if the destination
directory, which is on a different file system, lacks ACL support.
tests/rm/fail-eperm
+3 -4
View File
@@ -59,7 +59,6 @@ delete @ENV{qw(BASH_ENV CDPATH ENV PATH)};
$ENV{IFS} = '';
my @dir_list = qw(/tmp /var/tmp /usr/tmp);
my $rm = '../../src/rm';
# Find a directory with the sticky bit set.
my $found_dir;
@@ -96,8 +95,8 @@ foreach my $dir (@dir_list)
# Invoke rm on this file and ensure that we get the
# expected exit code and diagnostic.
my $cmd = "$rm -f -- $target_file";
open RM, "$cmd 2>&1 |"
my $cmd = "rm -f -- $target_file";
open RM, "PATH=../../src $cmd 2>&1 |"
or die "$ME: cannot execute `$cmd'\n";
my $line = <RM>;
@@ -118,7 +117,7 @@ foreach my $dir (@dir_list)
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";