diff options
| author | Jim Meyering <meyering@redhat.com> | 2007-10-14 21:47:08 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2007-10-14 21:47:08 +0200 |
| commit | 84c3fb94ac9e9fb46e7c06f2cf52f9659ca33a9d (patch) | |
| tree | cd735d70eb0d2102cf09d01ef32ea7a495d2ad66 /tests/rm | |
| parent | b81697cd4a071b7fada8e0ff12e5058d49717a1b (diff) | |
| download | coreutils-84c3fb94ac9e9fb46e7c06f2cf52f9659ca33a9d.tar.xz | |
Pull all TESTS_ENVIRONMENT settings "up" into tests/check.mk.
* tests/Makefile.am.in (TESTS_ENVIRONMENT): Remove definition.
* tests/chgrp/Makefile.am: Likewise.
* tests/chmod/Makefile.am: Likewise.
* tests/chown/Makefile.am: Likewise.
* tests/cp/Makefile.am: Likewise.
* tests/dd/Makefile.am: Likewise.
* tests/du/Makefile.am: Likewise.
* tests/install/Makefile.am: Likewise.
* tests/ln/Makefile.am: Likewise.
* tests/ls/Makefile.am: Likewise.
* tests/misc/Makefile.am: Likewise.
* tests/mkdir/Makefile.am: Likewise.
* tests/mv/Makefile.am: Likewise.
* tests/readlink/Makefile.am: Likewise.
* tests/rm/Makefile.am: Likewise.
* tests/rmdir/Makefile.am: Likewise.
* tests/tail-2/Makefile.am: Likewise.
* tests/touch/Makefile.am: Likewise.
* tests/check.mk (TESTS_ENVIRONMENT) [EXEEXT, EGREP, MAKE, PERL]:
[CONFIG_HEADER, build_programs, host_os, host_triplet, PATH]:
[REPLACE_GETCWD, CU_TEST_NAME]: Add definitions here.
* tests/misc/pwd-long: Use $abs_top_builddir/src, not $BUILD_SRC_DIR.
* tests/dd/skip-seek: Don't use $ENV{PROG}.
* tests/rm/empty-name: Likewise.
* tests/rm/unreadable: Likewise.
* tests/mv/i-1: Likewise.
Diffstat (limited to 'tests/rm')
| -rw-r--r-- | tests/rm/Makefile.am | 8 | ||||
| -rwxr-xr-x | tests/rm/empty-name | 4 | ||||
| -rwxr-xr-x | tests/rm/unreadable | 2 |
3 files changed, 3 insertions, 11 deletions
diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am index 0f760066a..6b6595958 100644 --- a/tests/rm/Makefile.am +++ b/tests/rm/Makefile.am @@ -43,13 +43,5 @@ TESTS = \ isatty EXTRA_DIST = $(TESTS) -TESTS_ENVIRONMENT = \ - RM=../../src/rm \ - MKDIR=../../src/mkdir \ - CONFIG_HEADER=$(CONFIG_HEADER) \ - PERL="$(PERL)" \ - CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \ - PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \ - PROG=rm include $(top_srcdir)/tests/check.mk diff --git a/tests/rm/empty-name b/tests/rm/empty-name index b709dff1d..ead842245 100755 --- a/tests/rm/empty-name +++ b/tests/rm/empty-name @@ -1,7 +1,7 @@ #!/bin/sh # Make sure that rm -r '' fails. -# Copyright (C) 1998, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 1998, 2003, 2005, 2007 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ use strict; # Turn off localisation of executable's ouput. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; -my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n"; +my $prog = 'rm'; my @Tests = ( diff --git a/tests/rm/unreadable b/tests/rm/unreadable index 66a59515c..2fbe0320d 100755 --- a/tests/rm/unreadable +++ b/tests/rm/unreadable @@ -37,7 +37,7 @@ use strict; my $d = "dir-$$"; my $mkdir = {PRE => sub {mkdir $d,0100 or die "$d: $!\n"}}; -my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n"; +my $prog = 'rm'; my @Tests = ( |