diff options
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 26 | ||||
-rw-r--r-- | Build/source/texk/web2c/am/web.am | 10 | ||||
-rwxr-xr-x[-rw-r--r--] | Build/source/texk/web2c/tests/bibtex-auxinclude.test | 0 |
4 files changed, 25 insertions, 12 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index e224f7f6583..7257598d089 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -7,6 +7,7 @@ * lib/openclose.c (open_input_with_dirname): new fn. * tests/bibtex-auxinclude.test: new test. * tests/auxinclude*.*: files for test. + * am/web.am (web_tests): include bibtex-auxinclude.test. Suggestion from John Collins. See thread from http://tug.org/pipermail/tex-live/2018-May/041624.html. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 1ed0c3ce030..abdd6dfefa3 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -2613,7 +2613,8 @@ am__EXEEXT_41 = bibtex.test dvicopy.test dvitype.test gftodvi.test \ pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \ vptovf.test weave.test am__EXEEXT_42 = $(am__EXEEXT_41) tests/bibtex-openout-test.pl \ - tests/bibtex-longline-test.pl tests/bibtex-mem.test + tests/bibtex-longline-test.pl tests/bibtex-mem.test \ + tests/bibtex-auxinclude.test @WEB_TRUE@am__EXEEXT_43 = $(am__EXEEXT_42) TEST_SUITE_LOG = test-suite.log am__test_logs1 = $(TESTS:=.log) @@ -2972,13 +2973,16 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ ctangleboot.cin cwebboot.cin cwebboot.hin tangle.test \ $(web_programs:=.web) $(web_programs:=.ch) $(web_tests) \ tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst \ - tests/allbib.aux tests/allbib.tex tests/apalike.bst \ - tests/badpl.pl tests/badtfm.tfm tests/badvf.tfm tests/badvf.vf \ - tests/badvpl.vpl tests/batch.tex tests/check.log \ - tests/cmr10.600gf tests/cmr10.pk tests/cmr10.pl \ - tests/cmr10.tfm tests/cmr7.tfm tests/cmr8.tfm tests/cmti10.tfm \ - tests/cmtt10.tfm tests/cmtt8.tfm tests/dict tests/eight.tex \ - tests/end.tex tests/exampl.aux tests/exampl.tex tests/gray.tfm \ + tests/auxinclude.aux tests/auxinclude.bbl tests/auxinclude.bib \ + tests/auxinclude.tex tests/auxinclude2.aux \ + tests/auxinclude2.tex tests/allbib.aux tests/allbib.tex \ + tests/apalike.bst tests/badpl.pl tests/badtfm.tfm \ + tests/badvf.tfm tests/badvf.vf tests/badvpl.vpl \ + tests/batch.tex tests/check.log tests/cmr10.600gf \ + tests/cmr10.pk tests/cmr10.pl tests/cmr10.tfm tests/cmr7.tfm \ + tests/cmr8.tfm tests/cmti10.tfm tests/cmtt10.tfm \ + tests/cmtt8.tfm tests/dict tests/eight.tex tests/end.tex \ + tests/exampl.aux tests/exampl.tex tests/gray.tfm \ tests/hello.tex tests/io.mf tests/just.texi tests/label.mp \ tests/label.mpx tests/logo8.tfm tests/longline.aux \ tests/longline.bib tests/longline.tex tests/longtfm.tex \ @@ -3493,7 +3497,8 @@ web_programs = bibtex dvicopy dvitype gftodvi gftopk gftype mft \ patgen pktogf pktype pltotf pooltype tftopl vftovp vptovf weave web_tests = $(web_programs:=.test) tests/bibtex-openout-test.pl \ - tests/bibtex-longline-test.pl tests/bibtex-mem.test + tests/bibtex-longline-test.pl tests/bibtex-mem.test \ + tests/bibtex-auxinclude.test nodist_bibtex_SOURCES = bibtex.c bibtex.h nodist_dvicopy_SOURCES = dvicopy.c dvicopy.h nodist_dvitype_SOURCES = dvitype.c dvitype.h @@ -18999,7 +19004,8 @@ bibtex-web2c: bibtex.p $(web2c_depend) web2c/cvtbib.sed bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch $(tangle) bibtex bibtex bibtex.log tests/bibtex-openout-test.log tests/bibtex-longline-test.log \ - tests/bibtex-mem.log: bibtex$(EXEEXT) + tests/bibtex-mem.log \ + tests/bibtex-auxinclude.log: bibtex$(EXEEXT) dvicopy.c dvicopy.h: dvicopy-web2c @$(web2c) dvicopy dvicopy-web2c: dvicopy.p $(web2c_depend) diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am index fcb7165d7db..f5b288e837a 100644 --- a/Build/source/texk/web2c/am/web.am +++ b/Build/source/texk/web2c/am/web.am @@ -1,6 +1,7 @@ ## texk/web2c/am/web.am: Makefile fragment for normal web programs (except tangle). ## -## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2018 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. web_programs = bibtex dvicopy dvitype gftodvi gftopk gftype mft \ @@ -28,8 +29,10 @@ bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch $(tangle) bibtex bibtex web_tests += tests/bibtex-openout-test.pl tests/bibtex-longline-test.pl web_tests += tests/bibtex-mem.test +web_tests += tests/bibtex-auxinclude.test bibtex.log tests/bibtex-openout-test.log tests/bibtex-longline-test.log \ - tests/bibtex-mem.log: bibtex$(EXEEXT) + tests/bibtex-mem.log \ + tests/bibtex-auxinclude.log: bibtex$(EXEEXT) nodist_dvicopy_SOURCES = dvicopy.c dvicopy.h dvicopy.c dvicopy.h: dvicopy-web2c @@ -181,6 +184,9 @@ DISTCLEANFILES += longline.aux longline.bbl longline.bib longline.blg ## tests/bibtex-mem.test EXTRA_DIST += tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst DISTCLEANFILES += tests/memtest.bib tests/memtest?.* +## tests/bibtex-auxinclinde.test +EXTRA_DIST += tests/auxinclude.aux tests/auxinclude.bbl tests/auxinclude.bib +EXTRA_DIST += tests/auxinclude.tex tests/auxinclude2.aux tests/auxinclude2.tex ## dvicopy.test DISTCLEANFILES += tests/xstory.dvi tests/xpplr.dvi ## dvitype.test diff --git a/Build/source/texk/web2c/tests/bibtex-auxinclude.test b/Build/source/texk/web2c/tests/bibtex-auxinclude.test index 39e004b6a85..39e004b6a85 100644..100755 --- a/Build/source/texk/web2c/tests/bibtex-auxinclude.test +++ b/Build/source/texk/web2c/tests/bibtex-auxinclude.test |