diff options
| author | Karl Berry <karl@freefriends.org> | 2017-03-27 18:00:45 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-03-27 18:00:45 +0000 |
| commit | f6e2e4efbdd44ba2ce51fc1555361c23ec6c8beb (patch) | |
| tree | 9997ce03ee8a6032c671c664ff04abc7e89e5729 /Build | |
| parent | d87f8cf45a06f7b5db4d26d44843a947ab47f55f (diff) | |
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
Diffstat (limited to 'Build')
47 files changed, 168 insertions, 113 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index 3d760abea67..66c275438c0 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,8 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + (EXTRA_DIST): TLpatches not Tlpatches. + 2017-03-16 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import libpng-1.6.29. diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index e76d1f5fbe7..249af956119 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -7,14 +7,12 @@ ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. -## + ## We want to re-distribute the whole libpng source tree. -## EXTRA_DIST = $(LIBPNG_TREE) ## Changes applied to the original source tree -## -EXTRA_DIST += Tlpatches +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am @@ -48,8 +46,7 @@ nodist_libpng_a_SOURCES = \ $(libpng_a_OBJECTS): config.force ## Tests -## -TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE) +AM_TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE); export LIBPNG_TREE; if build TESTS = libpng.test check_PROGRAMS = pngtest @@ -76,4 +73,3 @@ rebuild_prereq = rebuild_target = all include $(srcdir)/../../am/rebuild.am - diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index cfc78b27786..82871d33dde 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -562,7 +562,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(LIBPNG_TREE) Tlpatches +EXTRA_DIST = $(LIBPNG_TREE) TLpatches NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed @@ -592,7 +592,7 @@ nodist_libpng_a_SOURCES = \ @LIBPNG_TREE@/pngerror.c \ @LIBPNG_TREE@/pngpread.c -TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE) +AM_TESTS_ENVIRONMENT = LIBPNG_TREE=$(LIBPNG_TREE); export LIBPNG_TREE; @build_TRUE@TESTS = libpng.test @build_TRUE@dist_check_SCRIPTS = libpng.test CLEANFILES = pngout.png rebuild.stamp diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog index 0e7196ce60a..74048038adb 100644 --- a/Build/source/libs/teckit/ChangeLog +++ b/Build/source/libs/teckit/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (EXTRA_DIST): TLpatches not Tlpatches. + 2016-12-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import TECkit-2.5.6. diff --git a/Build/source/libs/teckit/Makefile.am b/Build/source/libs/teckit/Makefile.am index 1da454696c0..9709f851b34 100644 --- a/Build/source/libs/teckit/Makefile.am +++ b/Build/source/libs/teckit/Makefile.am @@ -4,14 +4,12 @@ ## Copyright 2017 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. -## + ## We want to re-distribute the whole original TECkit source tree. -## EXTRA_DIST = $(TECKIT_TREE) ## Patches applied to the original source tree -## -EXTRA_DIST += Tlpatches +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am @@ -79,4 +77,3 @@ rebuild_prereq = rebuild_target = all include $(srcdir)/../../am/rebuild.am - diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in index 8766c311c0c..9c777a6fbdc 100644 --- a/Build/source/libs/teckit/Makefile.in +++ b/Build/source/libs/teckit/Makefile.in @@ -576,7 +576,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(TECKIT_TREE) Tlpatches teckit.test tex-text.map \ +EXTRA_DIST = $(TECKIT_TREE) TLpatches teckit.test tex-text.map \ tex-text.tec NEVER_DIST = `find . $(NEVER_NAMES)` diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog index f46aca5fab4..d8345036d99 100644 --- a/Build/source/libs/xpdf/ChangeLog +++ b/Build/source/libs/xpdf/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (EXTRA_DIST): TLpatches not Tlpatches. + 2016-02-15 Karl Berry <karl@tug.org> * xpdf-PATCHES: rename from xpdf-3.04-PATCHES. diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am index ea4b2e22f3f..f5005923108 100644 --- a/Build/source/libs/xpdf/Makefile.am +++ b/Build/source/libs/xpdf/Makefile.am @@ -31,8 +31,7 @@ EXTRA_DIST = $(XPDF_TREE) EXTRA_DIST += xpdf-foolabs ## Actual patches applied to the original source tree -## -EXTRA_DIST += Tlpatches +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am @@ -123,4 +122,3 @@ rebuild_target = all CLEANFILES = include $(srcdir)/../../am/rebuild.am - diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in index 21f0a33bb07..6d6082dbb40 100644 --- a/Build/source/libs/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/Makefile.in @@ -395,7 +395,7 @@ top_srcdir = @top_srcdir@ #======================================================================== #======================================================================== ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = $(XPDF_TREE) xpdf-foolabs Tlpatches +EXTRA_DIST = $(XPDF_TREE) xpdf-foolabs TLpatches NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index 3a8e1c32635..1f9f138c48a 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,8 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + (EXTRA_DIST): TLpatches not Tlpatches. + 2016-02-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * Makefile.am, configure.ac: New convention. diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am index 45f663d55db..e655816c109 100644 --- a/Build/source/libs/zziplib/Makefile.am +++ b/Build/source/libs/zziplib/Makefile.am @@ -7,14 +7,12 @@ ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. -## + ## We want to re-distribute the whole zziplib source tree. -## EXTRA_DIST = $(ZZIPLIB_TREE) ## Changes applied to the original source tree -## -EXTRA_DIST += Tlpatches +EXTRA_DIST += TLpatches # Files not to be distributed include $(srcdir)/../../am/dist_hook.am @@ -43,7 +41,7 @@ $(libzzip_a_OBJECTS): config.force DISTCLEANFILES = include/_msvc.in _configs.sed -TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE) +AM_TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE); export ZZIPLIB_TREE; if build TESTS = zziplib.test check_PROGRAMS = unzzip @@ -71,4 +69,3 @@ rebuild_target = all CLEANFILES = include $(srcdir)/../../am/rebuild.am - diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index b7f6a71f253..503a305fb77 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -572,7 +572,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(ZZIPLIB_TREE) Tlpatches +EXTRA_DIST = $(ZZIPLIB_TREE) TLpatches NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed @@ -596,7 +596,7 @@ nodist_libzzip_a_SOURCES = \ @ZZIPLIB_TREE@/zzip/zip.c DISTCLEANFILES = include/_msvc.in _configs.sed config.force -TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE) +AM_TESTS_ENVIRONMENT = ZZIPLIB_TREE=$(ZZIPLIB_TREE); export ZZIPLIB_TREE; @build_TRUE@TESTS = zziplib.test @build_TRUE@dist_check_SCRIPTS = zziplib.test nodist_unzzip_SOURCES = @ZZIPLIB_TREE@/bins/unzzip.c diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog index 44605686473..cb55112e3fd 100644 --- a/Build/source/texk/chktex/ChangeLog +++ b/Build/source/texk/chktex/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + 2016-09-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * Import ChkTeX 1.7.6. diff --git a/Build/source/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am index 4ec9036551a..5f95522b897 100644 --- a/Build/source/texk/chktex/Makefile.am +++ b/Build/source/texk/chktex/Makefile.am @@ -10,7 +10,7 @@ # Adapted for TeX Live from chktex/Makefile.in # #************************************************************************ -## + ## We want to re-distribute the whole original chktex source tree. ## ## With current automake (1.10.2) 'make distcheck' fails when @@ -19,7 +19,6 @@ EXTRA_DIST = $(CHKTEX_TREE) ## Patches applied to the original source tree -## EXTRA_DIST += TLpatches # Files not to be distributed @@ -119,11 +118,10 @@ CLEANFILES = $(nodist_bin_SCRIPTS) ChkTeX.aux ChkTeX.dvi ChkTeX.log ChkTeX.ps st @KPATHSEA_RULE@ ## Tests -## TESTS = chktex.test chktex.log: chktex$(EXEEXT) EXTRA_DIST += $(TESTS) -TESTS_ENVIRONMENT = CHKTEX_TREE=$(CHKTEX_TREE) TEXMFCNF=$(abs_srcdir)/../kpathsea +AM_TESTS_ENVIRONMENT = CHKTEX_TREE=$(CHKTEX_TREE); export CHKTEX_TREE; +AM_TESTS_ENVIRONMENT += TEXMFCNF=$(abs_srcdir)/../kpathsea; export TEXMFCNF; CLEANFILES += chktest - diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in index 7a49897f2d4..ae56d241240 100644 --- a/Build/source/texk/chktex/Makefile.in +++ b/Build/source/texk/chktex/Makefile.in @@ -14,6 +14,12 @@ @SET_MAKE@ +#************************************************************************ +# +# Adapted for TeX Live from chktex/Makefile.in +# +#************************************************************************ + VPATH = @srcdir@ @@ -577,12 +583,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -#************************************************************************ -# -# Adapted for TeX Live from chktex/Makefile.in -# -#************************************************************************ EXTRA_DIST = $(CHKTEX_TREE) TLpatches regex/COPYING.LIB regex/README \ $(top_builddir)/../../build-aux/relpath ChkTeX.pdf ChkTeX.tex \ $(TESTS) @@ -636,7 +636,8 @@ pdfdoc_DATA = ChkTeX.pdf CLEANFILES = $(nodist_bin_SCRIPTS) ChkTeX.aux ChkTeX.dvi ChkTeX.log \ ChkTeX.ps stamp-ChkTeX chktest TESTS = chktex.test -TESTS_ENVIRONMENT = CHKTEX_TREE=$(CHKTEX_TREE) TEXMFCNF=$(abs_srcdir)/../kpathsea +AM_TESTS_ENVIRONMENT = CHKTEX_TREE=$(CHKTEX_TREE); export CHKTEX_TREE; \ + TEXMFCNF=$(abs_srcdir)/../kpathsea; export TEXMFCNF; all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog index 54012367a0e..7d9e800d312 100644 --- a/Build/source/texk/dvi2tty/ChangeLog +++ b/Build/source/texk/dvi2tty/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + 2016-04-03 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * Delete the directory dvi2tty-PATCHES/ because upstream diff --git a/Build/source/texk/dvi2tty/Makefile.am b/Build/source/texk/dvi2tty/Makefile.am index d55aa023382..8ba5a1656e2 100644 --- a/Build/source/texk/dvi2tty/Makefile.am +++ b/Build/source/texk/dvi2tty/Makefile.am @@ -53,7 +53,7 @@ TESTS = disdvi.test dvi2tty.test disdvi.log: disdvi$(EXEXET) dvi2tty.log: dvi2tty$(EXEEXT) -TESTS_ENVIRONMENT = DVI2TTY_TREE=$(DVI2TTY_TREE) +AM_TESTS_ENVIRONMENT = DVI2TTY_TREE=$(DVI2TTY_TREE); export DVI2TTY_TREE; EXTRA_DIST += $(TESTS) ## disdvi.test @@ -64,4 +64,3 @@ EXTRA_DIST += ligtest.tty test.tty testc.tty tests.tty testu.tty DISTCLEANFILES += ligtest.out test.out testc.out tests.out testu.out DISTCLEANFILES += table.out tablec.out tables.out tableu.out tableuC.out DISTCLEANFILES += tableEu.out tableEu1.out tableEuC.out tableEua.out - diff --git a/Build/source/texk/dvi2tty/Makefile.in b/Build/source/texk/dvi2tty/Makefile.in index 021d7782ea9..348f61ca595 100644 --- a/Build/source/texk/dvi2tty/Makefile.in +++ b/Build/source/texk/dvi2tty/Makefile.in @@ -581,7 +581,7 @@ man1_MANS = \ $(DVI2TTY_TREE)/dvi2tty.1 TESTS = disdvi.test dvi2tty.test -TESTS_ENVIRONMENT = DVI2TTY_TREE=$(DVI2TTY_TREE) +AM_TESTS_ENVIRONMENT = DVI2TTY_TREE=$(DVI2TTY_TREE); export DVI2TTY_TREE; DISTCLEANFILES = ligtest.dout ligtest.out test.out testc.out tests.out \ testu.out table.out tablec.out tables.out tableu.out \ tableuC.out tableEu.out tableEu1.out tableEuC.out tableEua.out diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog index 1f435caaea2..919f35ae8a3 100644 --- a/Build/source/texk/dvipsk/ChangeLog +++ b/Build/source/texk/dvipsk/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + 2017-03-21 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * dvips.c: Show information and exit if dvips finds options diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am index 8dd2eb1027e..e7229b85b3e 100644 --- a/Build/source/texk/dvipsk/Makefile.am +++ b/Build/source/texk/dvipsk/Makefile.am @@ -1,6 +1,8 @@ +## $Id$ ## Makefile.am for the TeX Live subdirectory texk/dvipsk/ ## -## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2017 Karl Berry <tex-live@tug.org> +## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## SUBDIRS = squeeze @@ -115,11 +117,11 @@ TESTS += beginfontk1.test eepic-nan.test pfbincl.test \ beginfontk1.log eepic-nan.log pfbincl.log \ quotecmd-test.log same-name.log test-dvips.log: dvips$(EXEEXT) -TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea -TESTS_ENVIRONMENT += TEXCONFIG=$(srcdir)/testdata -TESTS_ENVIRONMENT += TEXFONTS=$(srcdir)/testdata -TESTS_ENVIRONMENT += TEXFONTMAPS=$(srcdir)/testdata -TESTS_ENVIRONMENT += TEXPSHEADERS=$(srcdir)/testdata +AM_TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea; export TEXMFCNF; +AM_TESTS_ENVIRONMENT += TEXCONFIG=$(srcdir)/testdata; export TEXCONFIG; +AM_TESTS_ENVIRONMENT += TEXFONTS=$(srcdir)/testdata; export TEXFONTS; +AM_TESTS_ENVIRONMENT += TEXFONTMAPS=$(srcdir)/testdata; export TEXFONTMAPS; +AM_TESTS_ENVIRONMENT += TEXPSHEADERS=$(srcdir)/testdata; export TEXPSHEADERS; EXTRA_DIST += \ $(TESTS) \ diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in index f0e4b105b48..d7114690c19 100644 --- a/Build/source/texk/dvipsk/Makefile.in +++ b/Build/source/texk/dvipsk/Makefile.in @@ -738,9 +738,11 @@ CLEANFILES = $(prologues) texc.lpro TEST_EXTENSIONS = .pl .test TESTS = afm2tfm-test.pl beginfontk1.test eepic-nan.test pfbincl.test \ quotecmd-test.pl same-name.test test-dvips.test -TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea \ - TEXCONFIG=$(srcdir)/testdata TEXFONTS=$(srcdir)/testdata \ - TEXFONTMAPS=$(srcdir)/testdata TEXPSHEADERS=$(srcdir)/testdata +AM_TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea; export \ + TEXMFCNF; TEXCONFIG=$(srcdir)/testdata; export TEXCONFIG; \ + TEXFONTS=$(srcdir)/testdata; export TEXFONTS; \ + TEXFONTMAPS=$(srcdir)/testdata; export TEXFONTMAPS; \ + TEXPSHEADERS=$(srcdir)/testdata; export TEXPSHEADERS; NEVER_DIST = `find . $(NEVER_NAMES)` NEVER_NAMES = -name .svn NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in index 3b81fce7c12..17b47fe233c 100644 --- a/Build/source/texk/dvisvgm/Makefile.in +++ b/Build/source/texk/dvisvgm/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 43208 2017-02-13 17:57:19Z karl $ +# $Id: Makefile.am 43567 2017-03-21 17:43:10Z karl $ # Makefile.am for the TeX Live subdirectory texk/dvisvgm/ # # Copyright 2015-2017 Karl Berry <tex-live@tug.org> diff --git a/Build/source/texk/gregorio/ChangeLog b/Build/source/texk/gregorio/ChangeLog index 7220feaea9d..481ef272b57 100644 --- a/Build/source/texk/gregorio/ChangeLog +++ b/Build/source/texk/gregorio/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + 2016-09-29 Karl Berry <karl@tug.org> * configure.ac (FILENAME_VERSION): no need to define for TL. diff --git a/Build/source/texk/gregorio/Makefile.am b/Build/source/texk/gregorio/Makefile.am index e45e82a2f24..1de6788f0e4 100644 --- a/Build/source/texk/gregorio/Makefile.am +++ b/Build/source/texk/gregorio/Makefile.am @@ -55,9 +55,9 @@ $(gregorio_OBJECTS): $(KPATHSEA_DEPEND) @KPATHSEA_RULE@ ## TESTS -## -TESTS_ENVIRONMENT = GREGORIO_TREE='$(GREGORIO_TREE)' +AM_TESTS_ENVIRONMENT = GREGORIO_TREE='$(GREGORIO_TREE)'; export GREGORIO_TREE; TESTS = gregorio.test gregorio.log: gregorio$(EXEEXT) + EXTRA_DIST += $(TESTS) DISTCLEANFILES = factus.gtex veni.gtex diff --git a/Build/source/texk/gregorio/Makefile.in b/Build/source/texk/gregorio/Makefile.in index 8ca00d24aa3..7d11a596936 100644 --- a/Build/source/texk/gregorio/Makefile.in +++ b/Build/source/texk/gregorio/Makefile.in @@ -599,7 +599,7 @@ gregorio_SOURCES = \ @GREGORIO_TREE@/src/vowel/vowel-rules-y.c LDADD = $(KPATHSEA_LIBS) -TESTS_ENVIRONMENT = GREGORIO_TREE='$(GREGORIO_TREE)' +AM_TESTS_ENVIRONMENT = GREGORIO_TREE='$(GREGORIO_TREE)'; export GREGORIO_TREE; TESTS = gregorio.test DISTCLEANFILES = factus.gtex veni.gtex all: config_.h diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 0e6d823feef..724bc342f54 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + 2017-03-18 Karl Berry <karl@tug.org> * version.ac, diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index e72ca29407e..67b4541d425 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -4,7 +4,7 @@ ## Copyright 2017 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. -## + SUBDIRS = . doc man EXTRA_DIST = PROJECTS @@ -303,14 +303,18 @@ install-exec-hook: install-bin-links uninstall-hook: uninstall-bin-links -## The tests +## Tests +AM_TESTS_ENVIRONMENT = LN_S='$(LN_S)'; export LN_S; +AM_TESTS_ENVIRONMENT += LT_OBJDIR='$(LT_OBJDIR)'; export LT_OBJDIR; +# TESTS = tests/cnfnewline.test tests/kpseaccess.test TESTS += tests/kpsereadlink.test tests/kpsestat.test tests/kpsewhich.test -TESTS_ENVIRONMENT = LN_S='$(LN_S)' LT_OBJDIR='$(LT_OBJDIR)' +# tests/cnfnewline.log tests/kpsewhich.log: kpsewhich$(EXEEXT) tests/kpseaccess.log: kpseaccess$(EXEEXT) tests/kpsereadlink.log: kpsereadlink$(EXEEXT) tests/kpsestat.log: kpsestat$(EXEEXT) +# EXTRA_DIST += $(TESTS) EXTRA_DIST += tests/cnfnewline/texmf.cnf @@ -322,5 +326,4 @@ CLEANFILES = include $(srcdir)/../../am/rebuild.am ## Not used -## EXTRA_DIST += mktex.cnf diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index a9d6023332b..84d5fa3463b 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -694,6 +694,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = . doc man $(am__append_6) +# EXTRA_DIST = PROJECTS putenv.c bsnl.awk cnf-to-paths.awk $(TESTS) \ tests/cnfnewline/texmf.cnf mktex.cnf AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/.. @@ -799,10 +800,12 @@ dist_web2c_DATA = mktex.opt mktexdir.opt mktexnam.opt dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm dist_noinst_DATA = texmf.cnf bin_links = mktexlsr:texhash +AM_TESTS_ENVIRONMENT = LN_S='$(LN_S)'; export LN_S; \ + LT_OBJDIR='$(LT_OBJDIR)'; export LT_OBJDIR; +# TESTS = tests/cnfnewline.test tests/kpseaccess.test \ tests/kpsereadlink.test tests/kpsestat.test \ tests/kpsewhich.test -TESTS_ENVIRONMENT = LN_S='$(LN_S)' LT_OBJDIR='$(LT_OBJDIR)' # Rebuild rebuild_prereq = @@ -2328,6 +2331,7 @@ uninstall-bin-links: install-exec-hook: install-bin-links uninstall-hook: uninstall-bin-links +# tests/cnfnewline.log tests/kpsewhich.log: kpsewhich$(EXEEXT) tests/kpseaccess.log: kpseaccess$(EXEEXT) tests/kpsereadlink.log: kpsereadlink$(EXEEXT) diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog index f18113c55ec..c50fed355b9 100644 --- a/Build/source/texk/lcdf-typetools/ChangeLog +++ b/Build/source/texk/lcdf-typetools/ChangeLog @@ -1,7 +1,11 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + 2016-06-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * tests/[uhv_dl.pfa, uhv_dl.pfb, uhv_dl.ps, Ant.pfb, tmf.pfa, tmf.pfb]: - Update for the version 2.106. + Update for version 2.106. 2016-06-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp> diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am index 0504dd633b4..10019fa2d37 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.am +++ b/Build/source/texk/lcdf-typetools/Makefile.am @@ -33,12 +33,11 @@ config.force: $(KPATHSEA_DEPEND) DISTCLEANFILES = config.force CXXLD.sh ## Tests -## +AM_TESTS_ENVIRONMENT = LCDF_TYPETOOLS_TREE=$(LCDF_TYPETOOLS_TREE); export LCDF_TYPETOOLS_TREE; + TESTS = tests/t1.test tests/tfm.test tests/ttf.test EXTRA_DIST += $(TESTS) -TESTS_ENVIRONMENT = LCDF_TYPETOOLS_TREE=$(LCDF_TYPETOOLS_TREE) - ## tests/t1.test EXTRA_DIST += tests/t2c.enc tests/uhvrrc8a.pfb \ tests/uhv_dl.pfa tests/uhv_dl.pfb tests/uhv_dl.ps \ @@ -53,4 +52,3 @@ EXTRA_DIST += tests/FonetikaDaniaIwonaeBold.ttf tests/texmfhome.otf \ tests/Fon.post tests/Fon.t42 \ tests/tmf.info tests/tmf.pfa tests/tmf.pfb tests/tmf.tables DISTCLEANFILES += Fon* tmf.* - diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in index 485dbcbf769..f81f727b671 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.in +++ b/Build/source/texk/lcdf-typetools/Makefile.in @@ -579,8 +579,8 @@ NEVER_NAMES_SUB = -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)' NEVER_NAMES_LT = -o -name .libs -o -name '*.lo' DISTCLEANFILES = config.force CXXLD.sh uhv* Ant* a_enhg3c.enc Fon* \ tmf.* +AM_TESTS_ENVIRONMENT = LCDF_TYPETOOLS_TREE=$(LCDF_TYPETOOLS_TREE); export LCDF_TYPETOOLS_TREE; TESTS = tests/t1.test tests/tfm.test tests/ttf.test -TESTS_ENVIRONMENT = LCDF_TYPETOOLS_TREE=$(LCDF_TYPETOOLS_TREE) all: autoconf.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/Build/source/texk/musixtnt/ChangeLog b/Build/source/texk/musixtnt/ChangeLog index 026bb161c3e..bf4c3c1b14a 100644 --- a/Build/source/texk/musixtnt/ChangeLog +++ b/Build/source/texk/musixtnt/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + 2016-02-10 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import musixtnt-2016-01-30. diff --git a/Build/source/texk/musixtnt/Makefile.am b/Build/source/texk/musixtnt/Makefile.am index 92de274a728..28a3ab94380 100644 --- a/Build/source/texk/musixtnt/Makefile.am +++ b/Build/source/texk/musixtnt/Makefile.am @@ -4,13 +4,11 @@ ## Copyright 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. -## + ## We want to re-distribute the whole musixtnt source tree. -## EXTRA_DIST = $(MUSIXTNT_TREE) ## Changes applied to the original source tree -## EXTRA_DIST += TLpatches # Files not to be distributed @@ -37,10 +35,10 @@ dist_man_MANS = \ @KPATHSEA_RULE@ ## Tests -## -TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests" +AM_TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests"; export testsrc; +# TESTS = $(MUSIXTNT_TREE)/msxlint.test $(MUSIXTNT_TREE)/msxlint.log: msxlint$(EXEEXT) + DISTCLEANFILES = linttest.* NEVER_DIST += $(TESTS:.test=.log) $(TESTS:.test=.trs) - diff --git a/Build/source/texk/musixtnt/Makefile.in b/Build/source/texk/musixtnt/Makefile.in index 905ba8ac3c6..51668318197 100644 --- a/Build/source/texk/musixtnt/Makefile.in +++ b/Build/source/texk/musixtnt/Makefile.in @@ -563,7 +563,8 @@ LDADD = $(KPATHSEA_LIBS) dist_man_MANS = \ $(MUSIXTNT_TREE)/msxlint.1 -TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests" +AM_TESTS_ENVIRONMENT = testsrc="$(srcdir)/$(MUSIXTNT_TREE)/tests"; export testsrc; +# TESTS = $(MUSIXTNT_TREE)/msxlint.test DISTCLEANFILES = linttest.* all: config.h diff --git a/Build/source/texk/ps2pk/ChangeLog b/Build/source/texk/ps2pk/ChangeLog index ec4ccb7c663..b160465e451 100644 --- a/Build/source/texk/ps2pk/ChangeLog +++ b/Build/source/texk/ps2pk/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + 2016-04-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * arith.h, pk2bm.c: Avoid compiler warnings. diff --git a/Build/source/texk/ps2pk/Makefile.am b/Build/source/texk/ps2pk/Makefile.am index 72e759b1923..83445d433b2 100644 --- a/Build/source/texk/ps2pk/Makefile.am +++ b/Build/source/texk/ps2pk/Makefile.am @@ -1,8 +1,10 @@ +## $Id$ ## Makefile.am for the TeX Live subdirectory texk/ps2pk/ ## -## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2017 Karl Berry <tex-live@tug.org> +## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. -## + bin_PROGRAMS = mag pfb2pfa pk2bm ps2pk noinst_PROGRAMS = pktest @@ -104,11 +106,12 @@ $(mag_OBJECTS) $(pfb2pfa_OBJECTS) $(pk2m_OBJECTS) $(ps2pk_OBJECTS) $(pktest_OBJE dist_man1_MANS = mag.1 pfb2pfa.1 pk2bm.1 ps2pk.1 ## Tests. -## -TESTS_ENVIRONMENT = KPSEWHICH='$(KPSEWHICH)' +AM_TESTS_ENVIRONMENT = KPSEWHICH='$(KPSEWHICH)'; export KPSEWHICH; +# TESTS = tests/lmmath.test tests/ps2pk.test tests/lmmath.log: ps2pk$(EXEEXT) tests/ps2pk.log: pfb2pfa$(EXEEXT) ps2pk$(EXEEXT) pk2bm$(EXEEXT) pktest$(EXEEXT) mag$(EXEEXT) +# EXTRA_DIST = $(TESTS) DISTCLEANFILES = ## tests/lmmath.test @@ -120,7 +123,6 @@ EXTRA_DIST += tests/Symbol.afm tests/Symbol.alpha.hex tests/Symbol.alpha.pix \ DISTCLEANFILES += Symbol* ## Not used -## EXTRA_DIST += \ CHANGES.type1 \ INSTALLATION \ @@ -140,4 +142,3 @@ EXTRA_DIST += \ texfiles.h \ trig.h \ usenet - diff --git a/Build/source/texk/ps2pk/Makefile.in b/Build/source/texk/ps2pk/Makefile.in index df3be15d71e..ee3ab7d44f8 100644 --- a/Build/source/texk/ps2pk/Makefile.in +++ b/Build/source/texk/ps2pk/Makefile.in @@ -661,8 +661,10 @@ pktest_SOURCES = \ pktest.c dist_man1_MANS = mag.1 pfb2pfa.1 pk2bm.1 ps2pk.1 -TESTS_ENVIRONMENT = KPSEWHICH='$(KPSEWHICH)' +AM_TESTS_ENVIRONMENT = KPSEWHICH='$(KPSEWHICH)'; export KPSEWHICH; +# TESTS = tests/lmmath.test tests/ps2pk.test +# EXTRA_DIST = $(TESTS) tests/lmmi12.600pk tests/Symbol.afm \ tests/Symbol.alpha.hex tests/Symbol.alpha.pix tests/Symbol.pfa \ tests/Symbol.pfb tests/Symbol10.300pk CHANGES.type1 \ diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index ba0389f75a0..189b79c0c5a 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Karl Berry <karl@freefriends.org> + + * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. + 2017-03-18 Karl Berry <karl@tug.org> * NEWS, diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 4e6b2cc5788..cb971eaa3ff 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -1,6 +1,8 @@ +## $Id$ ## Makefile.am for the TeX Live subdirectory texk/web2c/. ## -## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2017 Karl Berry <tex-live@tug.org> +## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## AM_CPPFLAGS = $(KPATHSEA_INCLUDES) @@ -147,7 +149,12 @@ texmf_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $( # For trip, trap, and other tests DIFF = diff DIFFFLAGS = -TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir) DIFF='$(DIFF)' DIFFFLAGS='$(DIFFFLAGS)' LN_S='$(LN_S)' KPSEWHICH='$(KPSEWHICH)' +AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; +AM_TESTS_ENVIRONMENT += DIFF='$(DIFF)'; export DIFF; +AM_TESTS_ENVIRONMENT += DIFFFLAGS='$(DIFFFLAGS)'; export DIFFFLAGS; +AM_TESTS_ENVIRONMENT += LN_S='$(LN_S)'; export LN_S; +AM_TESTS_ENVIRONMENT += KPSEWHICH='$(KPSEWHICH)'; export KPSEWHICH; + triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh .PHONY: triptrap diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 8d49a3c300d..b3de21b9271 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -2587,7 +2587,10 @@ texmf_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $( # For trip, trap, and other tests DIFF = diff DIFFFLAGS = -TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir) DIFF='$(DIFF)' DIFFFLAGS='$(DIFFFLAGS)' LN_S='$(LN_S)' KPSEWHICH='$(KPSEWHICH)' +AM_TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir); export abs_srcdir; \ + DIFF='$(DIFF)'; export DIFF; DIFFFLAGS='$(DIFFFLAGS)'; export \ + DIFFFLAGS; LN_S='$(LN_S)'; export LN_S; \ + KPSEWHICH='$(KPSEWHICH)'; export KPSEWHICH; triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh # The environment for making dumps. 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 |