From 84c3fb94ac9e9fb46e7c06f2cf52f9659ca33a9d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sun, 14 Oct 2007 21:47:08 +0200
Subject: 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.
---
 tests/misc/Makefile.am | 10 ----------
 tests/misc/pwd-long    |  7 ++++---
 2 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'tests/misc')

diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 7f5de4467..7425a6b07 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -20,16 +20,6 @@ EXTRA_DIST = $(TESTS)
 built_programs = \
   (cd $(top_builddir)/src && MAKEFLAGS= $(MAKE) -s built_programs.list)
 
-TESTS_ENVIRONMENT = \
-  built_programs="`$(built_programs)`" \
-  PERL="$(PERL)" \
-  BUILD_SRC_DIR="`pwd`/../../src" \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
-  CONFIG_HEADER=$(CONFIG_HEADER) \
-  REPLACE_GETCWD=$(REPLACE_GETCWD) \
-  host_os=$(host_os)
-
 # Do not choose a name that is a shell keyword like 'if', or a
 # commonly-used utility like 'cat' or 'test', as the name of a test.
 # Otherwise, VPATH builds will fail on hosts like Solaris, since they
diff --git a/tests/misc/pwd-long b/tests/misc/pwd-long
index 42a092c24..5e5b5ad5d 100755
--- a/tests/misc/pwd-long
+++ b/tests/misc/pwd-long
@@ -79,9 +79,10 @@ do
   }
 until (++$i == $n);
 
-my $build_src_dir = $ENV{BUILD_SRC_DIR};
-$build_src_dir
-  or die "$ME: envvar BUILD_SRC_DIR not defined\n";
+my $abs_top_builddir = $ENV{abs_top_builddir};
+$abs_top_builddir
+  or die "$ME: envvar abs_top_builddir not defined\n";
+my $build_src_dir = "$abs_top_builddir/src";
 if ($build_src_dir !~ m!^([-+.:/\w]+)$!)
   {
     warn "$0: skipping this test; odd build source directory name:\n"
-- 
cgit v1.2.3-70-g09d2