Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT, per

https://www.gnu.org/software/automake/manual/html_node/Scripts_002dbased-Testsuites.html
Means explicitly exporting all variables, unfortunately.
(EXTRA_DIST): correct Tlpatches typo to TLpatches.


git-svn-id: svn://tug.org/texlive/trunk@43617 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 24 insertions, 30 deletions

diff --git a/Build/source/utils/autosp/ChangeLog b/Build/source/utils/autosp/ChangeLog
index 3fa8fec2511..d7cb4ecc54e 100644
--- a/Build/source/utils/autosp/ChangeLog
+++ b/Build/source/utils/autosp/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-27  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+	* autosp.test: adapt.
+
 2017-02-28  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* Import autosp-2016-11-02.
diff --git a/Build/source/utils/autosp/Makefile.am b/Build/source/utils/autosp/Makefile.am
index 67ff083e9f8..f81903da849 100644
--- a/Build/source/utils/autosp/Makefile.am
+++ b/Build/source/utils/autosp/Makefile.am
@@ -1,9 +1,9 @@
 ## $Id$
 ## Makefile.am for the TeX Live subdirectory utils/autosp/
 ##
-## Copyright 2016 Karl Berry <tex-live@tug.org>
+## Copyright 2016-2017 Karl Berry <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
-##
+
 ## We want to re-distribute the whole original ps2eps source tree.
 EXTRA_DIST = $(AUTOSP_TREE)
 
@@ -27,17 +27,11 @@ man1_MANS = \
 	$(AUTOSP_TREE)/autosp.1
 
 ## Tests
-
-# We want to use the test and tests/ tree from the original dist.
-# So as to avoid embedding the original dist dir name in the test
-# script, we use $test_srcdir, defined here.
-AM_TESTS_ENVIRONMENT = test_srcdir=$(srcdir)/$(AUTOSP_TREE)/tests;
-
+AM_TESTS_ENVIRONMENT = AUTOSP_TREE=$(AUTOSP_TREE); export AUTOSP_TREE;
+#
 TESTS = $(AUTOSP_TREE)/autosp.test
 EXTRA_DIST += $(TESTS)
 autosp.log: autosp$(EXEEXT)
-
+#
 ## autosp.test files
 EXTRA_DIST += $(AUTOSP_TREE)/tests
-
-
diff --git a/Build/source/utils/autosp/Makefile.in b/Build/source/utils/autosp/Makefile.in
index 51963ab0ff9..a8e88f2b9c0 100644
--- a/Build/source/utils/autosp/Makefile.in
+++ b/Build/source/utils/autosp/Makefile.in
@@ -488,6 +488,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+#
 EXTRA_DIST = $(AUTOSP_TREE) $(TESTS) $(AUTOSP_TREE)/tests
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
@@ -505,11 +506,8 @@ autosp_SOURCES = \
 man1_MANS = \
 	$(AUTOSP_TREE)/autosp.1
 
-
-# We want to use the test and tests/ tree from the original dist.
-# So as to avoid embedding the original dist dir name in the test
-# script, we use $test_srcdir, defined here.
-AM_TESTS_ENVIRONMENT = test_srcdir=$(srcdir)/$(AUTOSP_TREE)/tests;
+AM_TESTS_ENVIRONMENT = AUTOSP_TREE=$(AUTOSP_TREE); export AUTOSP_TREE;
+#
 TESTS = $(AUTOSP_TREE)/autosp.test
 all: all-am
 
diff --git a/Build/source/utils/autosp/autosp-src/autosp.test b/Build/source/utils/autosp/autosp-src/autosp.test
index d4610464610..2b04f6601f6 100755
--- a/Build/source/utils/autosp/autosp-src/autosp.test
+++ b/Build/source/utils/autosp/autosp-src/autosp.test
@@ -1,15 +1,8 @@
 #! /bin/sh
-
-# Copyright 2016 Karl Berry <tex-live@tug.org>
+# Copyright 2016-2017 Karl Berry <tex-live@tug.org>
 # Copyright 2015 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-if test -z "$test_srcdir"; then
-  # If not set, then we are not running from `make check'.
-  test_srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'`  # == dirname $0
-  test "$test_srcdir" = "$0" && test_srcdir=.       # in case subst failed
-fi
-
 echo && echo "*** autosp --help"
 ./autosp --help || exit 1
 
@@ -20,9 +13,9 @@ echo && echo "*** autosp -dd (missing infile)"
 ./autosp -dd && exit 1
 
 echo && echo "*** autosp tests/quod2.aspc quod2.aspc"
-cp $test_srcdir/tests/quod2.aspc .
+cp $srcdir/$AUTOSP_TREE/tests/quod2.aspc .
 rm -f quod2.tex
 ./autosp quod2.aspc || exit 1
 
 echo && echo "*** diff quod2.tex tests/quod2.tex"
-diff quod2.tex $test_srcdir/tests/quod2.tex || exit 1
+diff quod2.tex $srcdir/$AUTOSP_TREE/tests/quod2.tex || exit 1
diff --git a/Build/source/utils/pmx/ChangeLog b/Build/source/utils/pmx/ChangeLog
index 1d3e41ca94b..d42497d2b50 100644
--- a/Build/source/utils/pmx/ChangeLog
+++ b/Build/source/utils/pmx/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-27  Karl Berry  <karl@freefriends.org>
+
+	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.
+
 2016-12-09  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* Import pmx 2.7.6.
diff --git a/Build/source/utils/pmx/Makefile.am b/Build/source/utils/pmx/Makefile.am
index 4ef2d610a60..f0cce79a016 100644
--- a/Build/source/utils/pmx/Makefile.am
+++ b/Build/source/utils/pmx/Makefile.am
@@ -240,12 +240,11 @@ EXTRA_libf2c_a_SOURCES += \
 dist_man1_MANS = pmxab.1 scor2prt.1
 
 ## Tests
-##
+AM_TESTS_ENVIRONMENT = test_src=$(srcdir)/$(PMX_TREE)/tests; export test_src;
+#
 TESTS = $(PMX_TREE)/pmx.test
 $(PMX_TREE)/pmx.log: pmxab$(EXEEXT) scor2prt$(EXEEXT)
 
-TESTS_ENVIRONMENT = test_src=$(srcdir)/$(PMX_TREE)/tests
-
 ## $(PMX_TREE)/pmx.test
 DISTCLEANFILES = barsant* pmxaerr.dat
 
diff --git a/Build/source/utils/pmx/Makefile.in b/Build/source/utils/pmx/Makefile.in
index f13e9d608b6..430cf88a5fe 100644
--- a/Build/source/utils/pmx/Makefile.in
+++ b/Build/source/utils/pmx/Makefile.in
@@ -845,8 +845,9 @@ EXTRA_libf2c_a_SOURCES = @PMX_TREE@/libf2c/uninit.c \
 	@PMX_TREE@/libf2c/qbitbits.c @PMX_TREE@/libf2c/qbitshft.c \
 	@PMX_TREE@/libf2c/signbit.c
 dist_man1_MANS = pmxab.1 scor2prt.1
+AM_TESTS_ENVIRONMENT = test_src=$(srcdir)/$(PMX_TREE)/tests; export test_src;
+#
 TESTS = $(PMX_TREE)/pmx.test
-TESTS_ENVIRONMENT = test_src=$(srcdir)/$(PMX_TREE)/tests
 DISTCLEANFILES = barsant* pmxaerr.dat
 all: all-am