* 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".

diff --git a/ChangeLog b/ChangeLog
index 349fe54108d04fb733534fa1cd32871fef86792f..ccfc9e8b07a33222db8467540bd12a89758999cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 

diff --git a/tests/rm/fail-eperm b/tests/rm/fail-eperm
index e2ce957eba8999cced7aaa739d1ed780d099e4ad..9bf0bfc05c5f76acd42cc69dae70a6774ce47e88 100755 (executable)
--- a/tests/rm/fail-eperm
+++ b/tests/rm/fail-eperm
@@ -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";