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 b63a4aea3609627172db88c497f08d7b4ee34376..ec8fd7ae74f563b6fabf585c8b83b7a87c12c5c8 100644 (file)
--- 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 3d9a11a25b1126fd646f3eafef14c2b3b052f2e1..8e54c6f206845edf7bfbfbee3f5636802491bef6 100644 (file)
--- 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 85c82e4f828257d33e84b7e603f6779a900b0446..ec1a67c1c011eefe4091094bd82fe683d93718b5 100644 (file)
--- 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 f29274744df2a4a22ef1e8c5cf0a889743780fce..0f760066a0e828bd9a35c7e1a9cab703e61ed43e 100644 (file)
--- 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