diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-01-14 08:43:02 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-01-14 08:43:02 +0000 |
commit | 50216eea936d2e63280e72e4ef8baa4f2f3ff49f (patch) | |
tree | cda1547d7d4f4fa4684024b8133889490b26d666 /Build/source/texk/web2c | |
parent | 73b882a4d15257fbd184084929861fc0f52d2552 (diff) |
minor build system update
git-svn-id: svn://tug.org/texlive/trunk@16708 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 49 | ||||
-rw-r--r-- | Build/source/texk/web2c/am/web.am | 15 |
3 files changed, 36 insertions, 33 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 79f73f97a57..f348691e4c8 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2009-12-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/web.am (EXTRA_DIST, TESTS, bibtex_tests, web_tests): + Reorganize to run tests only when building the programs (if WEB). + 2010-01-04 Karl Berry <karl@tug.org> * am/texmf.am (tex_tests): add tests/write18-quote-test.pl. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 1394d9b471d..1b3b0908e44 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -48,7 +48,7 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \ noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \ $(am__EXEEXT_20) $(am__EXEEXT_21) md5main$(EXEEXT) -TESTS = tangle.test $(bibtex_tests) $(am__EXEEXT_24) ctiedir/ctie.test \ +TESTS = tangle.test $(am__EXEEXT_24) ctiedir/ctie.test \ cwebdir/cweave.test tiedir/tie.test $(am__append_4) \ $(am__append_8) $(am__append_11) $(am__append_14) \ $(am__append_19) $(am__append_35) $(am__append_36) \ @@ -859,7 +859,7 @@ am__EXEEXT_22 = bibtex.test dvicopy.test dvitype.test gftodvi.test \ gftopk.test gftype.test mft.test patgen.test pktogf.test \ pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \ vptovf.test weave.test -am__EXEEXT_23 = $(am__EXEEXT_22) +am__EXEEXT_23 = $(am__EXEEXT_22) tests/bibtex-openout-test.pl @WEB_TRUE@am__EXEEXT_24 = $(am__EXEEXT_23) DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -1101,27 +1101,27 @@ EXTRA_LIBRARIES = libmf.a libmplib.a libpdftex.a liblua51.a libzzip.a \ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \ tangle.ch tangleboot.pin cwebdir ctangleboot.cin cwebboot.cin \ cwebboot.hin tangle.test $(web_programs:=.web) \ - $(web_programs:=.ch) $(bibtex_tests) $(web_tests) \ - tests/allbib.aux tests/allbib.tex tests/apalike.bst \ - 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/longtfm.tex \ - tests/magic.tex tests/memtest.tex tests/mltextst.tex \ - tests/mptest.mp tests/mptest.mpx tests/one.two.mf \ - tests/one.two.mp tests/one.two.tex tests/online.mf \ - tests/openout.mp tests/openout.tex tests/pagenum.dvi \ - tests/pagenum.tex tests/patgen.in tests/patterns \ - tests/plain.mft tests/pplr.dvi tests/pplr.tfm tests/ptmr.dvi \ - tests/ptmr.tfm tests/ptmr.vf tests/ptmr.vpl tests/rpsyr.tfm \ - tests/rptmr.tfm tests/story.dvi tests/testex.err \ - tests/testex.mp tests/testex.tex tests/translate tests/uno.dos \ - tests/xampl.bib ctiedir tiedir lib/mfmpi386.asm lib/mfmpw32.c \ - lib/texmfmp.c tests/common-test.pl texmfmem.h texmfmp-help.h \ - texmfmp.h $(tex_ch_srcs) lib/texmfmp.c tmf-pool.h $(tex_tests) \ + $(web_programs:=.ch) $(web_tests) tests/allbib.aux \ + tests/allbib.tex tests/apalike.bst 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/longtfm.tex tests/magic.tex tests/memtest.tex \ + tests/mltextst.tex tests/mptest.mp tests/mptest.mpx \ + tests/one.two.mf tests/one.two.mp tests/one.two.tex \ + tests/online.mf tests/openout.mp tests/openout.tex \ + tests/pagenum.dvi tests/pagenum.tex tests/patgen.in \ + tests/patterns tests/plain.mft tests/pplr.dvi tests/pplr.tfm \ + tests/ptmr.dvi tests/ptmr.tfm tests/ptmr.vf tests/ptmr.vpl \ + tests/rpsyr.tfm tests/rptmr.tfm tests/story.dvi \ + tests/testex.err tests/testex.mp tests/testex.tex \ + tests/translate tests/uno.dos tests/xampl.bib ctiedir tiedir \ + lib/mfmpi386.asm lib/mfmpw32.c lib/texmfmp.c \ + tests/common-test.pl texmfmem.h texmfmp-help.h texmfmp.h \ + $(tex_ch_srcs) lib/texmfmp.c tmf-pool.h $(tex_tests) \ tests/write18-quote.tex mf.web mf-binpool.ch mf.ch mftalk.h \ lib/texmfmp.c tmf-pool.h $(mf_tests) triptrap/README \ triptrap/mftrap.diffs triptrap/mftrap.fot triptrap/mftrap.log \ @@ -1423,8 +1423,8 @@ ctangleboot_DEPENDENCIES = $(default_dependencies) 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 nodist_bibtex_SOURCES = bibtex.c bibtex.h -bibtex_tests = tests/bibtex-openout-test.pl nodist_dvicopy_SOURCES = dvicopy.c dvicopy.h nodist_dvitype_SOURCES = dvitype.c dvitype.h nodist_gftodvi_SOURCES = gftodvi.c gftodvi.h @@ -1441,7 +1441,6 @@ nodist_tftopl_SOURCES = tftopl.c tftopl.h nodist_vftovp_SOURCES = vftovp.c vftovp.h nodist_vptovf_SOURCES = vptovf.c vptovf.h nodist_weave_SOURCES = weave.c weave.h -web_tests = $(web_programs:=.test) nodist_ctie_SOURCES = ctie.c ctie_CFLAGS = $(WARNING_CFLAGS) nodist_cweave_SOURCES = cweave.c cweb.c diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am index b8548dbd1ef..5d4700232fd 100644 --- a/Build/source/texk/web2c/am/web.am +++ b/Build/source/texk/web2c/am/web.am @@ -6,6 +6,10 @@ web_programs = bibtex dvicopy dvitype gftodvi gftopk gftype mft \ patgen pktogf pktype pltotf pooltype tftopl vftovp vptovf weave +## Basic tests, one for each program. +## +web_tests = $(web_programs:=.test) + if WEB bin_PROGRAMS += $(web_programs) endif WEB @@ -22,9 +26,7 @@ bibtex-web2c: bibtex.p $(web2c_depend) web2c/cvtbib.sed @$(web2c) bibtex bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch $(tangle) bibtex bibtex -bibtex_tests = tests/bibtex-openout-test.pl -TESTS += $(bibtex_tests) -EXTRA_DIST += $(bibtex_tests) +web_tests += tests/bibtex-openout-test.pl nodist_dvicopy_SOURCES = dvicopy.c dvicopy.h dvicopy.c dvicopy.h: dvicopy-web2c @@ -147,15 +149,12 @@ weave-web2c: weave.p $(web2c_depend) weave.p: tangle$(EXEEXT) weave.web weave.ch $(tangle) weave weave -## Tests (basic test for each program, named foo.test). +## Tests. ## -web_tests = $(web_programs:=.test) - -EXTRA_DIST += $(web_tests) - if WEB TESTS += $(web_tests) endif WEB +EXTRA_DIST += $(web_tests) ## bibtex.test DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg |