diff options
author | Jim Meyering <meyering@redhat.com> | 2008-05-14 09:37:02 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2008-05-17 08:27:58 +0200 |
commit | 1081bbc74e48010700783a9bb82a4657d1d02bd2 (patch) | |
tree | 41694f8ec4c2400349a367bb3680db8f09951438 /tests/rm | |
parent | ea54b6f47c92525267861e15314c61db83a86352 (diff) | |
download | coreutils-1081bbc74e48010700783a9bb82a4657d1d02bd2.tar.xz |
tests: remove ugly /bin/sh wrapper around each perl-based test script
* tests/check.mk (TESTS_ENVIRONMENT): Save and restore TMPDIR around
envvar-check, so that the few scripts that require $TMPDIR don't fail.
This is also good to let a user's default TMPDIR setting be used e.g.,
in the search for an 'other-partition'.
FIXME: this is pretty ugly. maybe undo it and find a better way.
(TESTS_ENVIRONMENT): Invoke perl scripts with $(PERL), and use -T
if the script requires that. Otherwise, use $(SHELL).
* tests/misc/md5sum-newline: Create a file whose name contains
a newline in Perl (resort to using "system", since open refuses).
Fix old brokenness exposed by this change:
* tests/du/files0-from: Correct test not to rely on stdin
being attached to a non-tty.
* tests/misc/sort (3g, 3h, 3i): Likewise: add explicit empty input file.
Avoid warnings about using qw()-around-commas.
* tests/rm/fail-eperm: Now that this test is run from a temporary
subdirectory, adjust the full name of the "rm" program we're going
to run.
Change #!/bin/sh to #!/usr/bin/perl, and factor out the few lines
of boilerplate code to invoke perl. Do not "require 5.00x";
a configure-time Perl test handles that
* tests/dd/skip-seek:
* tests/misc/base64:
* tests/misc/basename:
* tests/misc/cut:
* tests/misc/date:
* tests/misc/dircolors:
* tests/misc/dirname:
* tests/misc/expand:
* tests/misc/expr:
* tests/misc/factor:
* tests/misc/fmt:
* tests/misc/fold:
* tests/misc/head:
* tests/misc/head-elide-tail:
* tests/misc/join:
* tests/misc/ls-misc:
* tests/misc/md5sum:
* tests/misc/md5sum-newline:
* tests/misc/mktemp:
* tests/misc/od:
* tests/misc/paste:
* tests/misc/pr:
* tests/misc/printf-cov:
* tests/misc/seq:
* tests/misc/sha1sum:
* tests/misc/sha1sum-vec:
* tests/misc/sha224sum:
* tests/misc/sha256sum:
* tests/misc/sha384sum:
* tests/misc/sha512sum:
* tests/misc/sort-merge:
* tests/misc/stat-printf:
* tests/misc/sum:
* tests/misc/tac:
* tests/misc/tail:
* tests/misc/test:
* tests/misc/test-diag:
* tests/misc/tr:
* tests/misc/tsort:
* tests/misc/tty-eof:
* tests/misc/unexpand:
* tests/misc/uniq:
* tests/misc/wc:
* tests/misc/wc-files0-from:
* tests/misc/xstrtol:
* tests/mv/i-1:
* tests/pr/pr-tests:
* tests/rm/empty-name:
* tests/rm/fail-eperm:
* tests/rm/unreadable:
Diffstat (limited to 'tests/rm')
-rwxr-xr-x | tests/rm/empty-name | 10 | ||||
-rwxr-xr-x | tests/rm/fail-eperm | 28 | ||||
-rwxr-xr-x | tests/rm/unreadable | 9 |
3 files changed, 11 insertions, 36 deletions
diff --git a/tests/rm/empty-name b/tests/rm/empty-name index d940d01fa..31d08842e 100755 --- a/tests/rm/empty-name +++ b/tests/rm/empty-name @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/perl # Make sure that rm -r '' fails. # Copyright (C) 1998, 2003, 2005, 2007-2008 Free Software Foundation, Inc. @@ -16,17 +16,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - # On SunOS 4.1.3, running rm -r '' in a nonempty directory may # actually remove files with names of entries in the current directory # but relative to `/' rather than relative to the current directory. -: ${srcdir=.} -. $top_srcdir/tests/require-perl - -me=`echo $0|sed 's,.*/,,'` -exec $PERL -w -I$top_srcdir/tests -MCoreutils -M"CuTmpdir qw($me)" -- - <<\EOF -require 5.003; use strict; (my $program_name = $0) =~ s|.*/||; @@ -49,4 +42,3 @@ my $verbose = $ENV{VERBOSE}; my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); exit $fail; -EOF diff --git a/tests/rm/fail-eperm b/tests/rm/fail-eperm index 57b33e8f7..889831163 100755 --- a/tests/rm/fail-eperm +++ b/tests/rm/fail-eperm @@ -1,5 +1,4 @@ -#!/bin/sh -# -*- perl -*- +#!/usr/bin/perl -Tw # Ensure that rm gives the expected diagnostic when failing to remove a file # owned by some other user in a directory with the sticky bit set. @@ -18,23 +17,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -if test "$VERBOSE" = yes; then - set -x - rm --version -fi - -# FIXME-someday: when run as root we don't need all of the -# searching below. root can simply create the required -# dir/files and run the test as someone else. - -ARGV_0=$0 -export ARGV_0 - -exec $PERL -Tw -- - << \EOP -require 5.003; use strict; -(my $ME = $ENV{ARGV_0}) =~ s|.*/||; +(my $ME = $0) =~ s|.*/||; my $uid = $<; # skip if root @@ -51,7 +36,13 @@ delete @ENV{qw(BASH_ENV CDPATH ENV PATH)}; $ENV{IFS} = ''; my @dir_list = qw(/tmp /var/tmp /usr/tmp); -my $rm = '../src/rm'; +my $rm = "$ENV{abs_top_builddir}/src/rm"; + +# Untaint for upcoming popen. +$rm =~ m!^([-+\@\w./]+)$! + or (warn "$ME: unusual absolute builddir name; skipping this test\n"), + exit 77; +$rm = $1; # Find a directory with the sticky bit set. my $found_dir; @@ -160,4 +151,3 @@ if ( ! $found_file) . "...so, skipping this test\n"; exit 77; } -EOP diff --git a/tests/rm/unreadable b/tests/rm/unreadable index e0fd93f9b..86c1a51ce 100755 --- a/tests/rm/unreadable +++ b/tests/rm/unreadable @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/perl # Test "rm" and unreadable directories. # Copyright (C) 1998, 2003, 2005-2008 Free Software Foundation, Inc. @@ -16,12 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -: ${srcdir=.} -. $top_srcdir/tests/require-perl - -me=`echo $0|sed 's,.*/,,'` -exec $PERL -w -I$top_srcdir/tests -MCoreutils -M"CuTmpdir qw($me)" -- - <<\EOF -require 5.003; use strict; (my $program_name = $0) =~ s|.*/||; @@ -54,4 +48,3 @@ my $verbose = $ENV{VERBOSE}; my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); exit $fail; -EOF |