From 5017d1b4e1879cf1cf644c02205eca3f2b18a947 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 30 Dec 2006 12:50:43 +0100 Subject: * 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". --- ChangeLog | 4 ++++ tests/rm/fail-eperm | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 349fe5410..ccfc9e8b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-12-30 Jim Meyering + * 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 e2ce957eb..9bf0bfc05 100755 --- 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 = ; @@ -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"; -- cgit v1.2.3-54-g00ecf