diff options
31 files changed, 1207 insertions, 556 deletions
diff --git a/Build/source/texk/texlive/configure b/Build/source/texk/texlive/configure index 9597eece50a..34aa5cf4272 100755 --- a/Build/source/texk/texlive/configure +++ b/Build/source/texk/texlive/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for TeX Live 2010. +# Generated by GNU Autoconf 2.69 for TeX Live Scripts 2013. # # Report bugs to <tex-k@tug.org>. # @@ -577,10 +577,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='TeX Live' -PACKAGE_TARNAME='tex-live' -PACKAGE_VERSION='2010' -PACKAGE_STRING='TeX Live 2010' +PACKAGE_NAME='TeX Live Scripts' +PACKAGE_TARNAME='tex-live-scripts' +PACKAGE_VERSION='2013' +PACKAGE_STRING='TeX Live Scripts 2013' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1232,7 +1232,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TeX Live 2010 to adapt to many kinds of systems. +\`configure' configures TeX Live Scripts 2013 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1280,7 +1280,8 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/tex-live] + --docdir=DIR documentation root + [DATAROOTDIR/doc/tex-live-scripts] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1298,7 +1299,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live 2010:";; + short | recursive ) echo "Configuration of TeX Live Scripts 2013:";; esac cat <<\_ACEOF @@ -1391,7 +1392,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live configure 2010 +TeX Live Scripts configure 2013 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1446,7 +1447,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TeX Live $as_me 2010, which was +It was created by TeX Live Scripts $as_me 2013, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2312,8 +2313,8 @@ fi # Define the identity of the package. - PACKAGE='tex-live' - VERSION='2010' + PACKAGE='tex-live-scripts' + VERSION='2013' cat >>confdefs.h <<_ACEOF @@ -4040,7 +4041,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TeX Live $as_me 2010, which was +This file was extended by TeX Live Scripts $as_me 2013, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4097,7 +4098,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -TeX Live config.status 2010 +TeX Live Scripts config.status 2013 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/texlive/configure.ac b/Build/source/texk/texlive/configure.ac index afbca8f6ea2..c6d6a5bf93e 100644 --- a/Build/source/texk/texlive/configure.ac +++ b/Build/source/texk/texlive/configure.ac @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([TeX Live], [2010], [tex-k@tug.org]) +AC_INIT([TeX Live Scripts], [2013], [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([linked_scripts/ChangeLog]) AC_CONFIG_AUX_DIR([../../build-aux]) diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index d49bc076619..37a5d870f26 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, am/texmf.am, configure.ac, trap.test, trip.test, + triptrap-sh: Enable parallel-tests. + 2013-01-10 Khaled Hosny <khaledhosny@eglug.org> * configure.ac: Check if system has stdbool.h diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index d4add49d5f8..b883b576db0 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -137,8 +137,8 @@ texmf_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $( # For trip, trap, and other tests DIFF = diff DIFFFLAGS = -TESTS_ENVIRONMENT = DIFF='$(DIFF)' DIFFFLAGS='$(DIFFFLAGS)' LN_S='$(LN_S)' KPSEWHICH='$(KPSEWHICH)' -triptrap_diffs = srcdir=$(srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh +TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir) DIFF='$(DIFF)' DIFFFLAGS='$(DIFFFLAGS)' LN_S='$(LN_S)' KPSEWHICH='$(KPSEWHICH)' +triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh .PHONY: triptrap triptrap: diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 313dd2b5746..b67caa7531a 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -107,8 +107,9 @@ DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \ $(top_srcdir)/luatexdir/luafontloader/ff-config.in \ $(srcdir)/web2c-sh.in $(srcdir)/tangle-sh.in \ $(srcdir)/ctangleboot-sh.in $(srcdir)/silent-sh.in \ - $(top_srcdir)/../../build-aux/depcomp $(dist_man_MANS) AUTHORS \ - ChangeLog NEWS README ../../build-aux/config.guess \ + $(top_srcdir)/../../build-aux/depcomp $(dist_man_MANS) \ + $(top_srcdir)/../../build-aux/test-driver AUTHORS ChangeLog \ + NEWS README ../../build-aux/config.guess \ ../../build-aux/config.sub ../../build-aux/depcomp \ ../../build-aux/install-sh ../../build-aux/missing \ ../../build-aux/texinfo.tex ../../build-aux/ylwrap \ @@ -1164,7 +1165,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope check recheck distdir dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)c-auto.in # Read a list of newline-separated strings from the standard input, @@ -1208,6 +1209,140 @@ am__tty_colors = { \ std='[m'; \ fi; \ } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) am__EXEEXT_39 = 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 \ @@ -1215,6 +1350,26 @@ am__EXEEXT_39 = bibtex.test dvicopy.test dvitype.test gftodvi.test \ am__EXEEXT_40 = $(am__EXEEXT_39) tests/bibtex-openout-test.pl \ tests/bibtex-longline-test.pl tests/bibtex-mem.test @WEB_TRUE@am__EXEEXT_41 = $(am__EXEEXT_40) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -1831,8 +1986,8 @@ texmf_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $( # For trip, trap, and other tests DIFF = diff DIFFFLAGS = -TESTS_ENVIRONMENT = DIFF='$(DIFF)' DIFFFLAGS='$(DIFFFLAGS)' LN_S='$(LN_S)' KPSEWHICH='$(KPSEWHICH)' -triptrap_diffs = srcdir=$(srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh +TESTS_ENVIRONMENT = abs_srcdir=$(abs_srcdir) DIFF='$(DIFF)' DIFFFLAGS='$(DIFFFLAGS)' LN_S='$(LN_S)' KPSEWHICH='$(KPSEWHICH)' +triptrap_diffs = $(AM_V_GEN)srcdir=$(srcdir) abs_srcdir=$(abs_srcdir) MAKE=$(MAKE) $(SHELL) $(srcdir)/triptrap-sh # The environment for making dumps. # No need to specify TEXMF, as ../kpathsea/texmf.cnf should contain @@ -2915,7 +3070,7 @@ all: ff-config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .mm .o .obj .p .pin +.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .test .test$(EXEEXT) .trs am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../am/bin_links.am $(am__configure_deps) @@ -8983,98 +9138,196 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# exand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +tests/bibtex-openout-test.pl.log: tests/bibtex-openout-test.pl + @p='tests/bibtex-openout-test.pl'; \ + b='tests/bibtex-openout-test.pl'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/bibtex-longline-test.pl.log: tests/bibtex-longline-test.pl + @p='tests/bibtex-longline-test.pl'; \ + b='tests/bibtex-longline-test.pl'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +tests/write18-quote-test.pl.log: tests/write18-quote-test.pl + @p='tests/write18-quote-test.pl'; \ + b='tests/write18-quote-test.pl'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +ptexdir/pbibtex-openout-test.pl.log: ptexdir/pbibtex-openout-test.pl + @p='ptexdir/pbibtex-openout-test.pl'; \ + b='ptexdir/pbibtex-openout-test.pl'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +ptexdir/pbibtex-longline-test.pl.log: ptexdir/pbibtex-longline-test.pl + @p='ptexdir/pbibtex-longline-test.pl'; \ + b='ptexdir/pbibtex-longline-test.pl'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) $(am__remove_distdir) @@ -9290,6 +9543,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -9401,8 +9657,9 @@ uninstall-man: uninstall-man1 uninstall-man5 installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-hook uninstall-man uninstall-man1 uninstall-man5 + recheck tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-hook uninstall-man \ + uninstall-man1 uninstall-man5 dist-hook: @@ -9621,9 +9878,7 @@ trip.diffs: tex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: trip-clean trip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt tripin.fot tripin.log - rm -f trip.fot trip.log trip.dvi trip.typ tripos.tex 8terminal.tex - rm -rf tfm + rm -rf tripdir # We must create mfd.h before compiling mfextra.c. $(mf_OBJECTS) $(mf_nowin_OBJECTS): mfd.h @@ -9655,10 +9910,7 @@ mftrap.diffs: mf$(EXEEXT) $(triptrap_diffs) $@ .PHONY: trap-clean trap-clean: - rm -f trap.mf trap.base - rm -f mftrapin.fot mftrapin.log - rm -f mftrap.fot mftrap.log mftrap.tfm - rm -f mftrap.pl trap.72270gf trap.typ + rm -rf trapdir .PHONY: install-mpost-links uninstall-mpost-links @WIN32_TRUE@install-mpost-links: call_mpost$(EXEEXT) @@ -9681,15 +9933,7 @@ mptrap.diffs: mpost$(EXEEXT) $(triptrap_diffs) $@ .PHONY: mptrap-clean mptrap-clean: - rm -f mtrap.mp mtrap.mem trapf.tfm - rm -f mtrap.log mtrap.0 mtrap.1 writeo writeo.log writeo.2 - rm -f trap.mp trap.mpx mptrapin.fot mptrapin.log - rm -f mptrap.fot mptrap.log mptrap.tfm - rm -f trap.ps trap.mem trap.0 trap.5 trap.6 trap.95 trap.96 trap.97 - rm -f trap.98 trap.99 trap.100 trap.101 trap.102 trap.103 trap.104 - rm -f trap.105 trap.106 trap.107 trap.108 trap.109 trap.148 - rm -f trap.149 trap.150 trap.151 trap.197 trap.200 - rm -f mptrap.pl + rm -rf mptrapdir # Creating one file: just one rule tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w @@ -9750,14 +9994,7 @@ etrip.diffs: etex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: etrip-clean etrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log - rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ - rm -f xtripin.fot xtripin.log - rm -f xtrip.fot xtrip.log xtrip.typ - rm -f etrip.tfm etrip.pl etrip.tex etrip.fmt etripin.fot etripin.log - rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf etripdir # Rebuild $(pproglib) $(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c cd lib && $(MAKE) $(AM_MAKEFLAGS) libp.a @@ -9827,11 +10064,7 @@ ptrip.diffs: ptex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: ptrip-clean ptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt ptripin.fot ptripin.log - rm -f ptrip.fot ptrip.log trip.log trip.dvi trip.typ - rm -f ptrip.fot ptrip.log ptrip.dvi ptrip.typ - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf ptripdir $(eptex_OBJECTS): $(eptex_prereq) $(eptex_c_h): eptex-web2c @@ -9865,13 +10098,7 @@ eptrip.diffs: eptex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: eptrip-clean eptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt trip.log trip.dvi - rm -f cptripin.fot cptripin.log cptrip.fot cptrip.log cptrip.typ - rm -f xptripin.fot xptripin.log xptrip.fot xptrip.log xptrip.typ - rm -f eptripin.fot eptripin.log eptrip.fot eptrip.log eptrip.typ - rm -f etrip.tfm etrip.pl etrip.tex etrip.log etrip.fmt etrip.dvi etrip.out - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf eptripdir $(uptex_OBJECTS): $(uptex_prereq) $(uptex_c_h): uptex-web2c @@ -9937,11 +10164,7 @@ uptrip.diffs: uptex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: uptrip-clean uptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt uptripin.fot uptripin.log - rm -f uptrip.fot uptrip.log trip.log trip.dvi trip.typ - rm -f uptrip.fot uptrip.log uptrip.dvi uptrip.typ - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf uptripdir $(euptex_OBJECTS): $(euptex_prereq) $(euptex_c_h): euptex-web2c @@ -9969,13 +10192,7 @@ euptrip.diffs: euptex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: euptrip-clean euptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt trip.log trip.dvi - rm -f cuptripin.fot cuptripin.log cuptrip.fot cuptrip.log cuptrip.typ - rm -f xuptripin.fot xuptripin.log xuptrip.fot xuptrip.log xuptrip.typ - rm -f euptripin.fot euptripin.log euptrip.fot euptrip.log euptrip.typ - rm -f etrip.tfm etrip.pl etrip.tex etrip.log etrip.fmt etrip.dvi etrip.out - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf euptripdir $(pdftex_OBJECTS): $(pdftex_prereq) $(pdftex_c_h): pdftex-web2c @$(web2c) pdftex diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am index 67d6946bad2..6cd91ac71e9 100644 --- a/Build/source/texk/web2c/am/texmf.am +++ b/Build/source/texk/web2c/am/texmf.am @@ -1,6 +1,6 @@ ## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF. ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## Common for MF and TeX @@ -92,9 +92,7 @@ trip.diffs: tex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: trip-clean trip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt tripin.fot tripin.log - rm -f trip.fot trip.log trip.dvi trip.typ tripos.tex 8terminal.tex - rm -rf tfm + rm -rf tripdir ## Metafont ## @@ -197,10 +195,7 @@ mftrap.diffs: mf$(EXEEXT) $(triptrap_diffs) $@ .PHONY: trap-clean trap-clean: - rm -f trap.mf trap.base - rm -f mftrapin.fot mftrapin.log - rm -f mftrap.fot mftrap.log mftrap.tfm - rm -f mftrap.pl trap.72270gf trap.typ + rm -rf trapdir ## Test data ## diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 7a0a574bddf..b945a3cf675 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -34,7 +34,7 @@ WEB2CVERSION=tex_live_version() AC_SUBST([WEB2CVERSION]) dnl Common code for all programs using libkpathsea. -KPSE_COMMON([web2c programs], [serial-tests]) +KPSE_COMMON([web2c programs]) KPSE_CANONICAL_HOST AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes]) diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index 91e761c4537..63b42620f00 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,7 @@ +2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/eptex.am, eptrip.test: Enable parallel-tests. + 2012-12-16 Peter Breitenlohner <peb@mppmu.mpg.de> * am/eptex.am (eptex_version.h): Enable silent rules. diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am index 46f81f122fa..cc587e86d06 100644 --- a/Build/source/texk/web2c/eptexdir/am/eptex.am +++ b/Build/source/texk/web2c/eptexdir/am/eptex.am @@ -1,6 +1,6 @@ ## texk/web2c/eptexdir/am/eptex.am: Makefile fragment for e-pTeX. ## -## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## e-pTeX @@ -106,12 +106,7 @@ eptrip.diffs: eptex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: eptrip-clean eptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt trip.log trip.dvi - rm -f cptripin.fot cptripin.log cptrip.fot cptrip.log cptrip.typ - rm -f xptripin.fot xptripin.log xptrip.fot xptrip.log xptrip.typ - rm -f eptripin.fot eptripin.log eptrip.fot eptrip.log eptrip.typ - rm -f etrip.tfm etrip.pl etrip.tex etrip.log etrip.fmt etrip.dvi etrip.out - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf eptripdir + DISTCLEANFILES += eptrip.diffs diff --git a/Build/source/texk/web2c/eptexdir/eptrip.test b/Build/source/texk/web2c/eptexdir/eptrip.test index b545d9667c4..ed651194b3f 100755 --- a/Build/source/texk/web2c/eptexdir/eptrip.test +++ b/Build/source/texk/web2c/eptexdir/eptrip.test @@ -1,28 +1,24 @@ #! /bin/sh # Copyright (C) 2010 Hironori Kitagawa <tex-live@tug.org> -# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. -testdir=$srcdir/triptrap -etestdir=$srcdir/etexdir/etrip -eptestdir=$srcdir/eptexdir/eptrip +testdir=$abs_srcdir/triptrap +etestdir=$abs_srcdir/etexdir/etrip +eptestdir=$abs_srcdir/eptexdir/eptrip TEXMFCNF=$eptestdir; export TEXMFCNF +rm -rf eptripdir +mkdir eptripdir +cd eptripdir + dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" echo ">>> Running e-TRIP test for e-pTeX." >&2 echo ">>> See $eptestdir/eptrip.diffs for example of acceptable diffs." >&2 -rm -f trip.tfm trip.pl trip.tex trip.log trip.fmt trip.log trip.dvi \ - cptripin.fot cptripin.log cptrip.fot cptrip.log cptrip.typ \ - xptripin.fot xptripin.log xptrip.fot xptrip.log xptrip.typ \ - eptripin.fot eptripin.log eptrip.fot eptrip.log eptrip.typ \ - etrip.tfm etrip.pl etrip.tex etrip.log etrip.fmt etrip.dvi etrip.out \ - tripos.tex 8terminal.tex -rm -rf tfm - # pTeX outputs direction of boxes. P_SED1='s/, yoko direction//;s/yoko direction, //' P_SED2='s/yoko(math) direction, //' @@ -33,9 +29,9 @@ set -x echo "*** TRIP test for e-pTeX in compatibility mode ***." -./pltotf $testdir/trip.pl trip.tfm || exit 1 +../pltotf $testdir/trip.pl trip.tfm || exit 1 -./tftopl ./trip.tfm trip.pl || exit 1 +../tftopl ./trip.tfm trip.pl || exit 1 diff $testdir/trip.pl trip.pl || is_OK=false @@ -43,13 +39,13 @@ diff $testdir/trip.pl trip.pl || is_OK=false $LN_S $testdir/trip.tex . rm -f trip.log -./eptex --progname=epinitex --ini <$testdir/trip1.in >cptripin.fot +../eptex --progname=epinitex --ini <$testdir/trip1.in >cptripin.fot sed "$P_SED1" trip.log > cptripin.log || exit 1 diff $testdir/tripin.log cptripin.log # May as well test non-ini second time through. rm -f trip.log -./eptex --progname=eptex <$testdir/trip2.in >cptrip.fot +../eptex --progname=eptex <$testdir/trip2.in >cptrip.fot sed "$P_SED1;$P_SED2" trip.log > cptrip.log diff $testdir/trip.fot cptrip.fot @@ -57,7 +53,7 @@ diff $testdir/trip.fot cptrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $testdir/trip.log cptrip.log -eval ./dvitype $dvitype_args trip.dvi >cptrip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >cptrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ # ================================= @@ -65,13 +61,13 @@ $DIFF $DIFFFLAGS $testdir/trip.typ cptrip.typ echo "*** TRIP test for e-pTeX in extended mode ***." rm -f trip.log -./eptex --progname=epinitex --ini <$etestdir/etrip1.in >xptripin.fot +../eptex --progname=epinitex --ini <$etestdir/etrip1.in >xptripin.fot sed "$P_SED1" trip.log > xptripin.log || exit 1 diff $testdir/tripin.log xptripin.log # May as well test non-ini second time through. rm -f trip.log -./eptex --progname=eptex <$etestdir/trip2.in >xptrip.fot +../eptex --progname=eptex <$etestdir/trip2.in >xptrip.fot sed "$P_SED1;$P_SED2" trip.log > xptrip.log diff $testdir/trip.fot xptrip.fot @@ -79,28 +75,28 @@ diff $testdir/trip.fot xptrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $testdir/trip.log xptrip.log -eval ./dvitype $dvitype_args trip.dvi >xptrip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >xptrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ xptrip.typ # ================================= echo "*** e-TeX specific part of e-TRIP test for e-pTeX ***." -./pltotf $etestdir/etrip.pl etrip.tfm || exit 1 +../pltotf $etestdir/etrip.pl etrip.tfm || exit 1 -./tftopl ./etrip.tfm etrip.pl || exit 1 +../tftopl ./etrip.tfm etrip.pl || exit 1 diff $etestdir/etrip.pl etrip.pl || is_OK=false # get same filename in log $LN_S $eptestdir/etrip.tex . -./eptex --progname=epinitex --ini <$etestdir/etrip2.in >eptripin.fot +../eptex --progname=epinitex --ini <$etestdir/etrip2.in >eptripin.fot sed "$P_SED1" etrip.log > eptripin.log || exit 1 diff $etestdir/etripin.log eptripin.log # May as well test non-ini second time through. -./eptex --progname=eptex <$etestdir/etrip3.in >eptrip.fot +../eptex --progname=eptex <$etestdir/etrip3.in >eptrip.fot sed "$P_SED1;$P_SED2" etrip.log > eptrip.log diff $etestdir/etrip.fot eptrip.fot @@ -108,7 +104,7 @@ diff $etestdir/etrip.fot eptrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $eptestdir/etrip.log eptrip.log -eval ./dvitype $dvitype_args etrip.dvi >eptrip.typ || exit 1 +eval ../dvitype $dvitype_args etrip.dvi >eptrip.typ || exit 1 $DIFF $DIFFFLAGS $etestdir/etrip.typ eptrip.typ $is_OK || { diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index 45fc80dbf57..c6209ea517e 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,7 @@ +2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/etex.am, etrip.test: Enable parallel-tests. + 2012-12-16 Peter Breitenlohner <peb@mppmu.mpg.de> * am/etex.am (etex_version.h): Enable silent rules. diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 99ede798a36..379740f0c5e 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -1,6 +1,6 @@ ## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX. ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## e-TeX @@ -94,14 +94,7 @@ etrip.diffs: etex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: etrip-clean etrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log - rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ - rm -f xtripin.fot xtripin.log - rm -f xtrip.fot xtrip.log xtrip.typ - rm -f etrip.tfm etrip.pl etrip.tex etrip.fmt etripin.fot etripin.log - rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf etripdir ## Test data ## diff --git a/Build/source/texk/web2c/etexdir/etrip.test b/Build/source/texk/web2c/etexdir/etrip.test index da2fe891c32..4266de6ab46 100755 --- a/Build/source/texk/web2c/etexdir/etrip.test +++ b/Build/source/texk/web2c/etexdir/etrip.test @@ -1,47 +1,43 @@ #! /bin/sh -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. -testdir=$srcdir/triptrap -etestdir=$srcdir/etexdir/etrip +testdir=$abs_srcdir/triptrap +etestdir=$abs_srcdir/etexdir/etrip TEXMFCNF=$etestdir; export TEXMFCNF +rm -rf etripdir +mkdir etripdir +cd etripdir + dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" echo ">>> Running e-TRIP test for e-TeX." >&2 echo ">>> See $etestdir/etrip.diffs for example of acceptable diffs." >&2 -rm -f trip.tfm trip.pl trip.tex trip.fmt trip.dvi \ - ctripin.fot ctripin.log ctrip.fot ctrip.log ctrip.typ \ - xtripin.fot xtripin.log xtrip.fot xtrip.log xtrip.typ \ - etrip.tfm etrip.pl etrip.tex etrip.fmt etrip.dvi \ - etripin.fot etripin.log etrip.fot etrip.log etrip.out etrip.typ \ - tripos.tex 8terminal.tex -rm -rf tfm - is_OK=: set -x echo "*** TRIP test for e-TeX in compatibility mode ***." -./pltotf $testdir/trip.pl trip.tfm || exit 1 +../pltotf $testdir/trip.pl trip.tfm || exit 1 -./tftopl ./trip.tfm trip.pl || exit 1 +../tftopl ./trip.tfm trip.pl || exit 1 diff $testdir/trip.pl trip.pl || is_OK=false # get same filename in log $LN_S $testdir/trip.tex . -./etex --progname=einitex --ini <$testdir/trip1.in >ctripin.fot +../etex --progname=einitex --ini <$testdir/trip1.in >ctripin.fot mv trip.log ctripin.log || exit 1 diff $testdir/tripin.log ctripin.log # May as well test non-ini second time through. -./etex --progname=etex <$testdir/trip2.in >ctrip.fot +../etex --progname=etex <$testdir/trip2.in >ctrip.fot mv trip.log ctrip.log diff $testdir/trip.fot ctrip.fot @@ -49,19 +45,19 @@ diff $testdir/trip.fot ctrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $testdir/trip.log ctrip.log -eval ./dvitype $dvitype_args trip.dvi >ctrip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >ctrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ ctrip.typ # ============================== echo "*** TRIP test for e-TeX in extended mode ***." -./etex --progname=einitex --ini <$etestdir/etrip1.in >xtripin.fot +../etex --progname=einitex --ini <$etestdir/etrip1.in >xtripin.fot mv trip.log xtripin.log || exit 1 diff ctripin.log xtripin.log # May as well test non-ini second time through. -./etex --progname=etex <$etestdir/trip2.in >xtrip.fot +../etex --progname=etex <$etestdir/trip2.in >xtrip.fot mv trip.log xtrip.log diff ctrip.fot xtrip.fot @@ -69,35 +65,35 @@ diff ctrip.fot xtrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS ctrip.log xtrip.log -eval ./dvitype $dvitype_args trip.dvi >xtrip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >xtrip.typ || exit 1 $DIFF $DIFFFLAGS ctrip.typ xtrip.typ # ============================== echo "*** e-TeX specific part of e-TRIP test ***." -./pltotf $etestdir/etrip.pl etrip.tfm || exit 1 +../pltotf $etestdir/etrip.pl etrip.tfm || exit 1 -./tftopl ./etrip.tfm etrip.pl || exit 1 +../tftopl ./etrip.tfm etrip.pl || exit 1 diff $etestdir/etrip.pl etrip.pl || is_OK=false # get same filename in log $LN_S $etestdir/etrip.tex . -./etex --progname=einitex --ini <$etestdir/etrip2.in >etripin.fot +../etex --progname=einitex --ini <$etestdir/etrip2.in >etripin.fot mv etrip.log etripin.log || exit 1 diff $etestdir/etripin.log etripin.log # May as well test non-ini second time through. -./etex --progname=etex <$etestdir/etrip3.in >etrip.fot +../etex --progname=etex <$etestdir/etrip3.in >etrip.fot diff $etestdir/etrip.fot etrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $etestdir/etrip.log etrip.log -eval ./dvitype $dvitype_args etrip.dvi >etrip.typ || exit 1 +eval ../dvitype $dvitype_args etrip.dvi >etrip.typ || exit 1 $DIFF $DIFFFLAGS $etestdir/etrip.typ etrip.typ $is_OK || { diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 530036e79e2..c656f03f767 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,7 @@ +2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/euptex.am, euptrip.test: Enable parallel-tests. + 2012-09-04 Peter Breitenlohner <peb@mppmu.mpg.de> * euptexextra.h: Set AUTHOR to "Peter Breitenlohner" and diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am index 08a929d175c..70a643e8be8 100644 --- a/Build/source/texk/web2c/euptexdir/am/euptex.am +++ b/Build/source/texk/web2c/euptexdir/am/euptex.am @@ -1,6 +1,6 @@ ## texk/web2c/euptexdir/am/euptex.am: Makefile fragment for e-upTeX. ## -## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## e-upTeX @@ -106,12 +106,7 @@ euptrip.diffs: euptex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: euptrip-clean euptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt trip.log trip.dvi - rm -f cuptripin.fot cuptripin.log cuptrip.fot cuptrip.log cuptrip.typ - rm -f xuptripin.fot xuptripin.log xuptrip.fot xuptrip.log xuptrip.typ - rm -f euptripin.fot euptripin.log euptrip.fot euptrip.log euptrip.typ - rm -f etrip.tfm etrip.pl etrip.tex etrip.log etrip.fmt etrip.dvi etrip.out - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf euptripdir + DISTCLEANFILES += euptrip.diffs diff --git a/Build/source/texk/web2c/euptexdir/euptrip.test b/Build/source/texk/web2c/euptexdir/euptrip.test index 1d4120b5184..b755443084b 100755 --- a/Build/source/texk/web2c/euptexdir/euptrip.test +++ b/Build/source/texk/web2c/euptexdir/euptrip.test @@ -1,29 +1,25 @@ #! /bin/sh # Copyright (C) 2010 Hironori Kitagawa <tex-live@tug.org> -# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. -testdir=$srcdir/triptrap -etestdir=$srcdir/etexdir/etrip -eptestdir=$srcdir/eptexdir/eptrip -euptestdir=$srcdir/euptexdir/euptrip +testdir=$abs_srcdir/triptrap +etestdir=$abs_srcdir/etexdir/etrip +eptestdir=$abs_srcdir/eptexdir/eptrip +euptestdir=$abs_srcdir/euptexdir/euptrip TEXMFCNF=$euptestdir; export TEXMFCNF +rm -rf euptripdir +mkdir euptripdir +cd euptripdir + dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" echo ">>> Running e-TRIP test for e-upTeX." >&2 echo ">>> See $euptestdir/euptrip.diffs for example of acceptable diffs." >&2 -rm -f trip.tfm trip.pl trip.tex trip.log trip.fmt trip.log trip.dvi \ - cuptripin.fot cuptripin.log cuptrip.fot cuptrip.log cuptrip.typ \ - xuptripin.fot xuptripin.log xuptrip.fot xuptrip.log xuptrip.typ \ - euptripin.fot euptripin.log euptrip.fot euptrip.log euptrip.typ \ - etrip.tfm etrip.pl etrip.tex etrip.log etrip.fmt etrip.dvi etrip.out \ - tripos.tex 8terminal.tex -rm -rf tfm - # upTeX outputs direction of boxes. P_SED1='s/, yoko direction//;s/yoko direction, //' P_SED2='s/yoko(math) direction, //' @@ -34,9 +30,9 @@ set -x echo "*** TRIP test for e-upTeX in compatibility mode ***." -./pltotf $testdir/trip.pl trip.tfm || exit 1 +../pltotf $testdir/trip.pl trip.tfm || exit 1 -./tftopl ./trip.tfm trip.pl || exit 1 +../tftopl ./trip.tfm trip.pl || exit 1 diff $testdir/trip.pl trip.pl || is_OK=false @@ -44,13 +40,13 @@ diff $testdir/trip.pl trip.pl || is_OK=false $LN_S $testdir/trip.tex . rm -f trip.log -./euptex --progname=eupinitex --ini <$testdir/trip1.in >cuptripin.fot +../euptex --progname=eupinitex --ini <$testdir/trip1.in >cuptripin.fot sed "$P_SED1" trip.log > cuptripin.log || exit 1 diff $testdir/tripin.log cuptripin.log # May as well test non-ini second time through. rm -f trip.log -./euptex --progname=euptex <$testdir/trip2.in >cuptrip.fot +../euptex --progname=euptex <$testdir/trip2.in >cuptrip.fot sed "$P_SED1;$P_SED2" trip.log > cuptrip.log diff $testdir/trip.fot cuptrip.fot @@ -58,7 +54,7 @@ diff $testdir/trip.fot cuptrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $testdir/trip.log cuptrip.log -eval ./dvitype $dvitype_args trip.dvi >cuptrip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >cuptrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ cuptrip.typ # ================================= @@ -66,13 +62,13 @@ $DIFF $DIFFFLAGS $testdir/trip.typ cuptrip.typ echo "*** TRIP test for e-upTeX in extended mode ***." rm -f trip.log -./euptex --progname=eupinitex --ini <$etestdir/etrip1.in >xuptripin.fot +../euptex --progname=eupinitex --ini <$etestdir/etrip1.in >xuptripin.fot sed "$P_SED1" trip.log > xuptripin.log || exit 1 diff $testdir/tripin.log xuptripin.log # May as well test non-ini second time through. rm -f trip.log -./euptex --progname=euptex <$etestdir/trip2.in >xuptrip.fot +../euptex --progname=euptex <$etestdir/trip2.in >xuptrip.fot sed "$P_SED1;$P_SED2" trip.log > xuptrip.log diff $testdir/trip.fot xuptrip.fot @@ -80,28 +76,28 @@ diff $testdir/trip.fot xuptrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $testdir/trip.log xuptrip.log -eval ./dvitype $dvitype_args trip.dvi >xuptrip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >xuptrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ xuptrip.typ # ================================= echo "*** e-TeX specific part of e-TRIP test for e-upTeX ***." -./pltotf $etestdir/etrip.pl etrip.tfm || exit 1 +../pltotf $etestdir/etrip.pl etrip.tfm || exit 1 -./tftopl ./etrip.tfm etrip.pl || exit 1 +../tftopl ./etrip.tfm etrip.pl || exit 1 diff $etestdir/etrip.pl etrip.pl || is_OK=false # get same filename in log $LN_S $eptestdir/etrip.tex . -./euptex --progname=eupinitex --ini <$etestdir/etrip2.in >euptripin.fot +../euptex --progname=eupinitex --ini <$etestdir/etrip2.in >euptripin.fot sed "$P_SED1" etrip.log > euptripin.log || exit 1 diff $etestdir/etripin.log euptripin.log # May as well test non-ini second time through. -./euptex --progname=euptex <$etestdir/etrip3.in >euptrip.fot +../euptex --progname=euptex <$etestdir/etrip3.in >euptrip.fot sed "$P_SED1;$P_SED2" etrip.log > euptrip.log diff $etestdir/etrip.fot euptrip.fot @@ -109,7 +105,7 @@ diff $etestdir/etrip.fot euptrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $eptestdir/etrip.log euptrip.log -eval ./dvitype $dvitype_args etrip.dvi >euptrip.typ || exit 1 +eval ../dvitype $dvitype_args etrip.dvi >euptrip.typ || exit 1 $DIFF $DIFFFLAGS $etestdir/etrip.typ euptrip.typ $is_OK || { diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 7c439b7c9c2..8c68cb60418 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,7 @@ +2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/mplib.am, mptrap.test: Enable parallel-tests. + 2012-12-18 Peter Breitenlohner <peb@mppmu.mpg.de> * am/mplib.am: Enable silent rules. diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index 85f41ec6ac0..e8ae8808c17 100644 --- a/Build/source/texk/web2c/mplibdir/am/mplib.am +++ b/Build/source/texk/web2c/mplibdir/am/mplib.am @@ -1,6 +1,6 @@ ## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost. ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## MetaPost @@ -82,13 +82,5 @@ mptrap.diffs: mpost$(EXEEXT) $(triptrap_diffs) $@ .PHONY: mptrap-clean mptrap-clean: - rm -f mtrap.mp mtrap.mem trapf.tfm - rm -f mtrap.log mtrap.0 mtrap.1 writeo writeo.log writeo.2 - rm -f trap.mp trap.mpx mptrapin.fot mptrapin.log - rm -f mptrap.fot mptrap.log mptrap.tfm - rm -f trap.ps trap.mem trap.0 trap.5 trap.6 trap.95 trap.96 trap.97 - rm -f trap.98 trap.99 trap.100 trap.101 trap.102 trap.103 trap.104 - rm -f trap.105 trap.106 trap.107 trap.108 trap.109 trap.148 - rm -f trap.149 trap.150 trap.151 trap.197 trap.200 - rm -f mptrap.pl + rm -rf mptrapdir diff --git a/Build/source/texk/web2c/mplibdir/mptrap.test b/Build/source/texk/web2c/mplibdir/mptrap.test index e1eb9b00f92..86203400491 100755 --- a/Build/source/texk/web2c/mplibdir/mptrap.test +++ b/Build/source/texk/web2c/mplibdir/mptrap.test @@ -1,32 +1,26 @@ #! /bin/sh -testdir=$srcdir/triptrap +testdir=$abs_srcdir/triptrap TEXMFCNF=$testdir; export TEXMFCNF +rm -rf mptrapdir +mkdir mptrapdir +cd mptrapdir + dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" echo ">>> Running MPTRAP test for MetaPost." >&2 echo ">>> See $testdir/mptrap.diffs for example of acceptable diffs." >&2 -rm -f mtrap.mp mtrap.mem trapf.tfm -rm -f mtrap.log mtrap.0 mtrap.1 writeo writeo.log writeo.2 -rm -f trap.mp trap.mpx mptrapin.fot mptrapin.log -rm -f mptrap.fot mptrap.log mptrap.tfm -rm -f trap.ps trap.mem trap.0 trap.5 trap.6 trap.95 trap.96 trap.97 -rm -f trap.98 trap.99 trap.100 trap.101 trap.102 trap.103 trap.104 -rm -f trap.105 trap.106 trap.107 trap.108 trap.109 trap.148 -rm -f trap.149 trap.150 trap.151 trap.197 trap.200 -rm -f mptrap.pl - set -x -./pltotf $testdir/trapf.pl trapf.tfm +../pltotf $testdir/trapf.pl trapf.tfm # get same filename in log $LN_S $testdir/mtrap.mp . || exit 1 -./mpost --ini mtrap +../mpost --ini mtrap diff $testdir/mtrap.log mtrap.log diff $testdir/mtrap.0 mtrap.0 diff $testdir/mtrap.1 mtrap.1 @@ -37,7 +31,7 @@ $LN_S $testdir/trap.mp . || exit 1 $LN_S $testdir/trap.mpx . || exit 1 ## Why is --jobname required? And why --ini? -./mpost --ini --jobname=trap <$testdir/mptrap1.in >mptrapin.fot +../mpost --ini --jobname=trap <$testdir/mptrap1.in >mptrapin.fot mv trap.log mptrapin.log || exit 1 diff $testdir/mptrapin.log mptrapin.log diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 4e198992ff4..b7e7b2d6481 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -58,7 +58,8 @@ EXTRA_PROGRAMS = omfonts$(EXEEXT) DIST_COMMON = $(top_srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am pl-parser.h pl-parser.c pl-lexer.c \ $(top_srcdir)/../../build-aux/depcomp \ - $(top_srcdir)/../../build-aux/ylwrap ChangeLog + $(top_srcdir)/../../build-aux/ylwrap \ + $(top_srcdir)/../../build-aux/test-driver ChangeLog subdir = omegafonts ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ @@ -224,6 +225,186 @@ am__tty_colors = { \ std='[m'; \ fi; \ } +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -496,7 +677,7 @@ EXTRA_DIST = $(OMFONTS_tests) tests/charwd-r.pl tests/charwd-v.vpl \ all: all-am .SUFFIXES: -.SUFFIXES: .c .l .lo .o .obj .y +.SUFFIXES: .c .l .lo .log .o .obj .test .test$(EXEEXT) .trs .y $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/bin_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -719,98 +900,161 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# exand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -870,6 +1114,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -976,8 +1223,8 @@ uninstall-am: uninstall-binPROGRAMS installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-hook + recheck tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-hook # Rebuild $(proglib) diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index 15633fa6458..0f9c75a4945 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -58,7 +58,8 @@ subdir = otps DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am otp-parser.h \ otp-parser.c otp-lexer.c $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/ylwrap $(dist_man1_MANS) \ - $(noinst_HEADERS) ChangeLog + $(noinst_HEADERS) $(top_srcdir)/../../build-aux/test-driver \ + ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-asm.m4 \ @@ -224,7 +225,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + check recheck distdir am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -266,6 +267,158 @@ am__tty_colors = { \ std='[m'; \ fi; \ } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DIST_SUBDIRS = win32 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -524,7 +677,7 @@ CLEANFILES = xuni2lat.ocp xuni2lat.out all: all-recursive .SUFFIXES: -.SUFFIXES: .c .l .lo .o .obj .y +.SUFFIXES: .c .l .lo .log .o .obj .test .test$(EXEEXT) .trs .y $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -835,98 +988,161 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# exand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -1012,6 +1228,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1114,9 +1333,9 @@ uninstall-man: uninstall-man1 install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-man uninstall-man1 + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-binSCRIPTS uninstall-man uninstall-man1 # Rebuild $(proglib) diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 1befd59bdd8..c90255555b5 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,8 @@ +2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/ptex.am, pbibtex-mem.test, ptrip.test: + Enable parallel-tests. + 2013-01-04 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> * ptex-base.ch: \xkanjiskip around math_node etc. diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index 7976cdc7918..68062ae007f 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -1,6 +1,6 @@ ## texk/web2c/ptexdir/am/ptex.am: Makefile fragment for pTeX. ## -## Copyright (C) 2010-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) @@ -206,7 +206,7 @@ DISTCLEANFILES += tests/nissya_bib.* DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg ## ptexdir/pbibtex-mem.test EXTRA_DIST += tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst -DISTCLEANFILES += tests/memtest.bib tests/memtest?.* +DISTCLEANFILES += ptests/memtest.bib ptests/memtest?.* ## ptexdir/pdvitype.test DISTCLEANFILES += tests/xstory.dvityp tests/xpagenum.typ ## ptexdir/ppltotf.test @@ -226,10 +226,7 @@ ptrip.diffs: ptex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: ptrip-clean ptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt ptripin.fot ptripin.log - rm -f ptrip.fot ptrip.log trip.log trip.dvi trip.typ - rm -f ptrip.fot ptrip.log ptrip.dvi ptrip.typ - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf ptripdir + DISTCLEANFILES += ptrip.diffs diff --git a/Build/source/texk/web2c/ptexdir/pbibtex-mem.test b/Build/source/texk/web2c/ptexdir/pbibtex-mem.test index 69773b5f751..9767af8a741 100755 --- a/Build/source/texk/web2c/ptexdir/pbibtex-mem.test +++ b/Build/source/texk/web2c/ptexdir/pbibtex-mem.test @@ -1,11 +1,11 @@ #! /bin/sh -# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. # Using test data from Philipp Lehman <lehman@gmx.net> -test -d tests || mkdir -p tests +test -d ptests || mkdir -p ptests # Create bib data mk_bib () { @@ -47,13 +47,13 @@ EOF for t in 1 2 3; do - mk_aux memdata$t >tests/memtest$t.aux + mk_aux memdata$t >ptests/memtest$t.aux env= case $t in - 1) mk_bib 0 >tests/memtest.bib;; - 2) mk_bib 1 >>tests/memtest.bib;; + 1) mk_bib 0 >ptests/memtest.bib;; + 2) mk_bib 1 >>ptests/memtest.bib;; 3) env='ent_str_size=2000 glob_str_size=2000';; esac @@ -62,8 +62,8 @@ for t in 1 2 3; do eval $env \ TEXMFCNF=$srcdir/../kpathsea \ BSTINPUTS=$srcdir/tests \ - BIBINPUTS=./tests \ - ./pbibtex tests/memtest$t || exit 1 + BIBINPUTS=./ptests \ + ./pbibtex ptests/memtest$t || exit 1 done diff --git a/Build/source/texk/web2c/ptexdir/ptrip.test b/Build/source/texk/web2c/ptexdir/ptrip.test index 1ae53675851..4b00cd35a55 100755 --- a/Build/source/texk/web2c/ptexdir/ptrip.test +++ b/Build/source/texk/web2c/ptexdir/ptrip.test @@ -1,23 +1,22 @@ #! /bin/sh -# Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. -testdir=$srcdir/triptrap -ptestdir=$srcdir/ptexdir/ptrip +testdir=$abs_srcdir/triptrap +ptestdir=$abs_srcdir/ptexdir/ptrip TEXMFCNF=$ptestdir; export TEXMFCNF +rm -rf ptripdir +mkdir ptripdir +cd ptripdir + dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" echo ">>> Running TRIP test for pTeX." >&2 echo ">>> See $ptestdir/ptrip.diffs for example of acceptable diffs." >&2 -rm -f trip.tfm trip.pl trip.tex trip.fmt trip.dvi \ - ptripin.fot ptripin.log ptrip.fot ptrip.log ptrip.typ \ - tripos.tex 8terminal.tex -rm -rf tfm - # pTeX outputs direction of boxes. P_SED1='s/, yoko direction//;s/yoko direction, //' P_SED2='s/yoko(math) direction, //' @@ -28,9 +27,9 @@ set -x echo "*** TRIP test for pTeX ***." -./pltotf $testdir/trip.pl trip.tfm || exit 1 +../pltotf $testdir/trip.pl trip.tfm || exit 1 -./tftopl ./trip.tfm trip.pl || exit 1 +../tftopl ./trip.tfm trip.pl || exit 1 diff $testdir/trip.pl trip.pl || is_OK=false @@ -38,13 +37,13 @@ diff $testdir/trip.pl trip.pl || is_OK=false $LN_S $testdir/trip.tex . rm -f trip.log -./ptex --progname=pinitex --ini <$testdir/trip1.in >ptripin.fot +../ptex --progname=pinitex --ini <$testdir/trip1.in >ptripin.fot sed "$P_SED1" trip.log > ptripin.log || exit 1 diff $testdir/tripin.log ptripin.log # May as well test non-ini second time through. rm -f trip.log -./ptex --progname=ptex <$testdir/trip2.in >ptrip.fot +../ptex --progname=ptex <$testdir/trip2.in >ptrip.fot sed "$P_SED1;$P_SED2" trip.log > ptrip.log diff $testdir/trip.fot ptrip.fot @@ -52,7 +51,7 @@ diff $testdir/trip.fot ptrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $testdir/trip.log ptrip.log -eval ./dvitype $dvitype_args trip.dvi >ptrip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >ptrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ ptrip.typ $is_OK || { diff --git a/Build/source/texk/web2c/trap.test b/Build/source/texk/web2c/trap.test index 53024b35a85..5b1498f9dbb 100755 --- a/Build/source/texk/web2c/trap.test +++ b/Build/source/texk/web2c/trap.test @@ -1,41 +1,40 @@ #! /bin/sh -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. -testdir=$srcdir/triptrap +testdir=$abs_srcdir/triptrap TEXMFCNF=$testdir; export TEXMFCNF +rm -rf trapdir +mkdir trapdir +cd trapdir + dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" echo ">>> Running TRAP test for Metafont." >&2 echo ">>> See $testdir/mftrap.diffs for example of acceptable diffs." >&2 -rm -f trap.mf trap.base -rm -f mftrapin.fot mftrapin.log -rm -f mftrap.fot mftrap.log mftrap.tfm -rm -f mftrap.pl trap.72270gf trap.typ - set -x # get same filename in log $LN_S $testdir/trap.mf . -./mf --progname=inimf <$testdir/mftrap1.in >mftrapin.fot +../mf --progname=inimf <$testdir/mftrap1.in >mftrapin.fot mv trap.log mftrapin.log || exit 1 diff $testdir/mftrapin.log mftrapin.log -./mf --progname=inimf <$testdir/mftrap2.in >mftrap.fot +../mf --progname=inimf <$testdir/mftrap2.in >mftrap.fot mv trap.log mftrap.log || exit 1 mv trap.tfm mftrap.tfm || exit 1 diff $testdir/mftrap.fot mftrap.fot diff $testdir/mftrap.log mftrap.log -./tftopl ./mftrap.tfm mftrap.pl || exit 1 +../tftopl ./mftrap.tfm mftrap.pl || exit 1 diff $testdir/mftrap.pl mftrap.pl -./gftype -m -i ./trap.72270gf >trap.typ || exit 1 +../gftype -m -i ./trap.72270gf >trap.typ || exit 1 diff $testdir/trap.typ trap.typ exit 0 diff --git a/Build/source/texk/web2c/trip.test b/Build/source/texk/web2c/trip.test index b8317191623..23c37904f39 100755 --- a/Build/source/texk/web2c/trip.test +++ b/Build/source/texk/web2c/trip.test @@ -1,47 +1,47 @@ #! /bin/sh -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. -testdir=$srcdir/triptrap +testdir=$abs_srcdir/triptrap TEXMFCNF=$testdir; export TEXMFCNF +rm -rf tripdir +mkdir tripdir +cd tripdir + dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" echo ">>> Running TRIP test for TeX." >&2 echo ">>> See $testdir/trip.diffs for example of acceptable diffs." >&2 -rm -f trip.tfm trip.pl trip.tex trip.fmt tripin.fot tripin.log \ - trip.fot trip.log trip.dvi trip.typ tripos.tex 8terminal.tex -rm -rf tfm - is_OK=: set -x -./pltotf $testdir/trip.pl trip.tfm || exit 1 +../pltotf $testdir/trip.pl trip.tfm || exit 1 -./tftopl ./trip.tfm trip.pl || exit 1 +../tftopl ./trip.tfm trip.pl || exit 1 diff $testdir/trip.pl trip.pl || is_OK=false # get same filename in log $LN_S $testdir/trip.tex . -./tex --progname=initex --ini <$testdir/trip1.in >tripin.fot +../tex --progname=initex --ini <$testdir/trip1.in >tripin.fot mv trip.log tripin.log || exit 1 diff $testdir/tripin.log tripin.log # May as well test non-ini second time through. -./tex --progname=tex <$testdir/trip2.in >trip.fot +../tex --progname=tex <$testdir/trip2.in >trip.fot diff $testdir/trip.fot trip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $testdir/trip.log trip.log -eval ./dvitype $dvitype_args trip.dvi >trip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >trip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ trip.typ $is_OK || { diff --git a/Build/source/texk/web2c/triptrap-sh b/Build/source/texk/web2c/triptrap-sh index 8e2a15bbe66..dc443e4bbd5 100755 --- a/Build/source/texk/web2c/triptrap-sh +++ b/Build/source/texk/web2c/triptrap-sh @@ -1,7 +1,7 @@ #! /bin/sh # shell script to run TRIP and TRAP tests and create diffs. # -# Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -34,15 +34,9 @@ do && grep "PASS: $tst\.test" $tmp >/dev/null 2>&1 \ || { echo "FAIL: $tst.test"; exit 1; } echo ">>> Running $msg." >$file - sed -e "1,/^>>> Running $msg.\$/d" \ - -e "/^PASS: /,\$d" \ - -e "s%$srcdir/triptrap%SRCDIR/triptrap%" \ - -e "s%$srcdir/etexdir%SRCDIR/etexdir%" \ - -e "s%$srcdir/ptexdir%SRCDIR/ptexdir%" \ - -e "s%$srcdir/eptexdir%SRCDIR/eptexdir%" \ - -e "s%$srcdir/uptexdir%SRCDIR/uptexdir%" \ - -e "s%$srcdir/euptexdir%SRCDIR/euptexdir%" \ - $tmp >>$file + sed -e "s%$abs_srcdir/%SRCDIR/%" \ + -e "s%\.\./%./%" \ + $tst.log >>$file echo "PASS: $tst.test" >>$file rm -f $tmp echo "PASS: $tst.test" diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 95fc9af66ca..07d7811b5fa 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,7 @@ +2013-01-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/uptex.am, uptrip.test: Enable parallel-tests. + 2013-01-04 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> * uptex-m.ch: \xkanjiskip around math_node etc. diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am index 63af2121a76..ab265786dc3 100644 --- a/Build/source/texk/web2c/uptexdir/am/uptex.am +++ b/Build/source/texk/web2c/uptexdir/am/uptex.am @@ -1,6 +1,6 @@ ## texk/web2c/uptexdir/am/uptex.am: Makefile fragment for upTeX. ## -## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) @@ -194,10 +194,7 @@ uptrip.diffs: uptex$(EXEEXT) $(triptrap_diffs) $@ .PHONY: uptrip-clean uptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt uptripin.fot uptripin.log - rm -f uptrip.fot uptrip.log trip.log trip.dvi trip.typ - rm -f uptrip.fot uptrip.log uptrip.dvi uptrip.typ - rm -f tripos.tex 8terminal.tex - rm -rf tfm + rm -rf uptripdir + DISTCLEANFILES += uptrip.diffs diff --git a/Build/source/texk/web2c/uptexdir/uptrip.test b/Build/source/texk/web2c/uptexdir/uptrip.test index e9976a5b128..e7b384cf825 100755 --- a/Build/source/texk/web2c/uptexdir/uptrip.test +++ b/Build/source/texk/web2c/uptexdir/uptrip.test @@ -1,23 +1,22 @@ #! /bin/sh -# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. -testdir=$srcdir/triptrap -uptestdir=$srcdir/uptexdir/uptrip +testdir=$abs_srcdir/triptrap +uptestdir=$abs_srcdir/uptexdir/uptrip TEXMFCNF=$uptestdir; export TEXMFCNF +rm -rf uptripdir +mkdir uptripdir +cd uptripdir + dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" echo ">>> Running TRIP test for upTeX." >&2 echo ">>> See $uptestdir/uptrip.diffs for example of acceptable diffs." >&2 -rm -f trip.tfm trip.pl trip.tex trip.fmt trip.dvi \ - uptripin.fot uptripin.log uptrip.fot uptrip.log uptrip.typ \ - tripos.tex 8terminal.tex -rm -rf tfm - # upTeX outputs direction of boxes. P_SED1='s/, yoko direction//;s/yoko direction, //' P_SED2='s/yoko(math) direction, //' @@ -28,9 +27,9 @@ set -x echo "*** TRIP test for upTeX ***." -./pltotf $testdir/trip.pl trip.tfm || exit 1 +../pltotf $testdir/trip.pl trip.tfm || exit 1 -./tftopl ./trip.tfm trip.pl || exit 1 +../tftopl ./trip.tfm trip.pl || exit 1 diff $testdir/trip.pl trip.pl || is_OK=false @@ -38,13 +37,13 @@ diff $testdir/trip.pl trip.pl || is_OK=false $LN_S $testdir/trip.tex . rm -f trip.log -./uptex --progname=upinitex --ini <$testdir/trip1.in >uptripin.fot +../uptex --progname=upinitex --ini <$testdir/trip1.in >uptripin.fot sed "$P_SED1" trip.log > uptripin.log || exit 1 diff $testdir/tripin.log uptripin.log # May as well test non-ini second time through. rm -f trip.log -./uptex --progname=uptex <$testdir/trip2.in >uptrip.fot +../uptex --progname=uptex <$testdir/trip2.in >uptrip.fot sed "$P_SED1;$P_SED2" trip.log > uptrip.log diff $testdir/trip.fot uptrip.fot @@ -52,7 +51,7 @@ diff $testdir/trip.fot uptrip.fot # might actually be legitimate numerical differences. $DIFF $DIFFFLAGS $testdir/trip.log uptrip.log -eval ./dvitype $dvitype_args trip.dvi >uptrip.typ || exit 1 +eval ../dvitype $dvitype_args trip.dvi >uptrip.typ || exit 1 $DIFF $DIFFFLAGS $testdir/trip.typ uptrip.typ $is_OK || { |