From: Jim Meyering <meyering@redhat.com>
Date: Fri, 5 Oct 2007 10:14:16 +0000 (+0200)
Subject: Add PACKAGE_VERSION to TESTS_ENVIRONMENT via check.mk.
X-Git-Tag: v6.9.89~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=068fa34adcb846244c81704de2872102310de86e;p=thirdparty%2Fcoreutils.git

Add PACKAGE_VERSION to TESTS_ENVIRONMENT via check.mk.

* tests/check.mk (TESTS_ENVIRONMENT): Add PACKAGE_VERSION here,
rather than in every Makefile.am that needs it.
* tests/rm/Makefile.am (TESTS_ENVIRONMENT): Remove PACKAGE_VERSION.
* tests/misc/Makefile.am (TESTS_ENVIRONMENT): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index b63a4aea36..ec8fd7ae74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-05  Jim Meyering  <meyering@redhat.com>
+
+	Add PACKAGE_VERSION to TESTS_ENVIRONMENT via check.mk.
+	* tests/check.mk (TESTS_ENVIRONMENT): Add PACKAGE_VERSION here,
+	rather than in every Makefile.am that needs it.
+	* tests/rm/Makefile.am (TESTS_ENVIRONMENT): Remove PACKAGE_VERSION.
+	* tests/misc/Makefile.am (TESTS_ENVIRONMENT): Likewise.
+
 2007-10-04  Jim Meyering  <jim@meyering.net>
 
 	Adapt to new gnulib naming scheme.
diff --git a/tests/check.mk b/tests/check.mk
index 3d9a11a25b..8e54c6f206 100644
--- a/tests/check.mk
+++ b/tests/check.mk
@@ -34,6 +34,7 @@ check: vc_exe_in_TESTS
 # Append this, because automake does the same.
 TESTS_ENVIRONMENT +=			\
   top_srcdir=$(top_srcdir)		\
+  PACKAGE_VERSION=$(PACKAGE_VERSION)	\
   abs_top_srcdir=$(abs_top_srcdir)	\
   abs_top_builddir=$(abs_top_builddir)	\
   srcdir=$(srcdir)
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 85c82e4f82..ec1a67c1c0 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -22,7 +22,6 @@ built_programs = \
 
 TESTS_ENVIRONMENT = \
   built_programs="`$(built_programs)`" \
-  PACKAGE_VERSION=$(PACKAGE_VERSION) \
   PERL="$(PERL)" \
   BUILD_SRC_DIR="`pwd`/../../src" \
   CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am
index f29274744d..0f760066a0 100644
--- a/tests/rm/Makefile.am
+++ b/tests/rm/Makefile.am
@@ -50,7 +50,6 @@ TESTS_ENVIRONMENT = \
   PERL="$(PERL)" \
   CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
-  PACKAGE_VERSION=$(PACKAGE_VERSION) \
   PROG=rm
 
 include $(top_srcdir)/tests/check.mk