From 3a8f7a0c62cd02fd72ef0220d69d16d2c95ec1be Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 14 May 2012 10:15:46 +0000 Subject: more 'move old version of updmap.pl ...' git-svn-id: svn://tug.org/texlive/trunk@26363 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/tetex/ChangeLog | 3 +- Build/source/texk/tetex/Makefile.am | 11 +- Build/source/texk/tetex/Makefile.in | 137 +++------------------ .../source/texk/tetex/tests/updmap-cmdline-test.pl | 20 --- 4 files changed, 24 insertions(+), 147 deletions(-) delete mode 100755 Build/source/texk/tetex/tests/updmap-cmdline-test.pl (limited to 'Build/source/texk/tetex') diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 090c1b69d93..9a7f9bc15c1 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,6 +1,7 @@ 2012-04-14 Peter Breitenlohner - * Makefile.am: Adapt to updmap.pl => updmap-single.pl. + * tests/ (removed): Moved from here to ../texlive/. + * Makefile.am: Adapted. 2012-04-14 Norbert Preining diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am index bdff1c1d303..e4b3a4c27b3 100644 --- a/Build/source/texk/tetex/Makefile.am +++ b/Build/source/texk/tetex/Makefile.am @@ -5,8 +5,7 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = \ - updmap-single.pl +EXTRA_DIST = shell_scripts = \ updmap-sys @@ -104,12 +103,8 @@ EXTRA_DIST += \ ## EXTRA_DIST += \ old-fontinst.bat \ - old-updmap - -## Tests -## -TESTS = tests/updmap-cmdline-test.pl -EXTRA_DIST += $(TESTS) + old-updmap \ + updmap-single.pl ## .PHONY: run-texlinks diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in index bb76c2de3f0..2112a47f270 100644 --- a/Build/source/texk/tetex/Makefile.in +++ b/Build/source/texk/tetex/Makefile.in @@ -124,10 +124,6 @@ man5dir = $(mandir)/man5 NROFF = nroff MANS = $(dist_man1_MANS) $(dist_man5_MANS) DATA = $(dist_texconfig_DATA) $(dist_web2c_DATA) -am__tty_colors_dummy = \ - mgn= red= grn= lgn= blu= brg= std=; \ - am__color_tests=no -am__tty_colors = $(am__tty_colors_dummy) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -231,8 +227,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = updmap-single.pl ../../build-aux/relpath README.texdoctk \ - old-fontinst.bat old-updmap $(TESTS) +EXTRA_DIST = ../../build-aux/relpath README.texdoctk old-fontinst.bat \ + old-updmap updmap-single.pl shell_scripts = \ updmap-sys @@ -305,7 +301,6 @@ man1_links = $(bin_links) \ texconfig:texconfig-sys \ updmap:updmap-sys -TESTS = tests/updmap-cmdline-test.pl run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \ -f $(DESTDIR)$(web2cdir)/fmtutil.cnf \ -e "$(EXEEXT)" $(DESTDIR)$(bindir) @@ -621,99 +616,6 @@ CTAGS: cscope cscopelist: -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 "; \ - 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"; \ - 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)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - 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 - distdir: $(DISTFILES) @list='$(MANS)'; if test -n "$$list"; then \ list=`for p in $$list; do \ @@ -884,7 +786,6 @@ distcleancheck: distclean $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) installdirs: @@ -1001,23 +902,23 @@ uninstall-am: uninstall-dist_binSCRIPTS uninstall-dist_texconfigDATA \ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook uninstall-man: uninstall-man1 uninstall-man5 -.MAKE: check-am install-am install-data-am install-exec-am \ - install-strip uninstall-am - -.PHONY: all all-am am--refresh check check-TESTS check-am clean \ - clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzip \ - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-generic distcleancheck distdir distuninstallcheck \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-hook \ - install-dist_binSCRIPTS install-dist_texconfigDATA \ - install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \ - install-dist_web2cDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-exec-hook install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-man5 install-nodist_binSCRIPTS install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ +.MAKE: install-am install-data-am install-exec-am install-strip \ + uninstall-am + +.PHONY: all all-am am--refresh check check-am clean clean-generic dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-hook install-dist_binSCRIPTS \ + install-dist_texconfigDATA install-dist_texconfigSCRIPTS \ + install-dist_texmfSCRIPTS install-dist_web2cDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-exec-hook \ + install-html install-html-am install-info install-info-am \ + install-man install-man1 install-man5 \ + install-nodist_binSCRIPTS install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am \ uninstall-dist_binSCRIPTS uninstall-dist_texconfigDATA \ diff --git a/Build/source/texk/tetex/tests/updmap-cmdline-test.pl b/Build/source/texk/tetex/tests/updmap-cmdline-test.pl deleted file mode 100755 index 3875fb760e6..00000000000 --- a/Build/source/texk/tetex/tests/updmap-cmdline-test.pl +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env perl -# $Id$ -# Public domain. Originally written 2011, Karl Berry. -# Check that updmap can parse various cmdline invocations. - -# srcdir = tetex (in the source tree) -BEGIN { chomp ($srcdir = $ENV{"srcdir"} || `cd \`dirname $0\`/.. && pwd`); } -require "$srcdir/../tests/common-test.pl"; - -exit (&main ()); - -sub main { - my $ret = &test_run ("$srcdir/updmap.pl", "--version"); - - # we aren't going to fix this in the current updmap.pl. - # "foo", "--enable Map" - # "-n", "--quiet", - my $bad = $ret != 0; - return $bad; -} -- cgit v1.2.3