From 2f17be04e3a76b7cbd5772f8fd7b5d09f412f5d9 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 22 Jul 2002 08:12:27 +0000 Subject: This test might remove a file owned by the person running `make check'. Hoist definition of $target_file, and use that (not $f) in test for owner/dir/symlink. Patch by Michael Stone. --- tests/rm/fail-eperm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/rm/fail-eperm b/tests/rm/fail-eperm index a5eb4c18a..6d5f14c72 100755 --- a/tests/rm/fail-eperm +++ b/tests/rm/fail-eperm @@ -52,16 +52,17 @@ foreach my $dir (@dir_list) foreach my $f (readdir DIR_HANDLE) { + my $target_file = "$dir/$f"; + # Skip files owned by self, symlinks, and directories. # It's not technically necessary to skip symlinks, but it's simpler. - -l $f || -o _ || -d _ + -l $target_file || -o _ || -d _ and next; $found_file = 1; # Invoke rm on this file and ensure that we get the # expected exit code and diagnostic. - my $target_file = "$dir/$f"; my $cmd = "rm -f $target_file"; open RM, "$cmd 2>&1 |" or die "$ME: cannot execute `$cmd'\n"; -- cgit v1.2.3-54-g00ecf