diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-07-12 14:05:09 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-07-12 14:05:09 +0000 |
commit | 36f66d6df08c817f064302706bb6e34fed94fbd8 (patch) | |
tree | 7aa1e386a7c76ed995f3a87e2d544a16de1c06d5 | |
parent | 2c935654be055252786f67b5a056fc6b621f9c5f (diff) |
pmx: Use the same test script in TL and stand-alone
git-svn-id: svn://tug.org/texlive/trunk@27013 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/utils/pmx/ChangeLog | 2 | ||||
-rw-r--r-- | Build/source/utils/pmx/Makefile.am | 5 | ||||
-rw-r--r-- | Build/source/utils/pmx/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/utils/pmx/pmx-2.6.18/Makefile.am | 1 | ||||
-rwxr-xr-x | Build/source/utils/pmx/pmx-2.6.18/pmx.test | 17 | ||||
-rwxr-xr-x | Build/source/utils/pmx/pmx.test | 26 |
6 files changed, 16 insertions, 40 deletions
diff --git a/Build/source/utils/pmx/ChangeLog b/Build/source/utils/pmx/ChangeLog index c20461a0479..0d6dab82a3a 100644 --- a/Build/source/utils/pmx/ChangeLog +++ b/Build/source/utils/pmx/ChangeLog @@ -2,6 +2,8 @@ * configure.ac: Fixed a typo (AM_CPPPFLAGS => AM_CPPFLAGS). + * pmx.test (removed): Now distributed from upstream. + 2012-05-20 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: do handle pmx2pdf.lua here, since although it is diff --git a/Build/source/utils/pmx/Makefile.am b/Build/source/utils/pmx/Makefile.am index 1cb9cef6c64..fb5a6ef6625 100644 --- a/Build/source/utils/pmx/Makefile.am +++ b/Build/source/utils/pmx/Makefile.am @@ -253,11 +253,10 @@ dist_man1_MANS = pmx2pdf.1 pmxab.1 scor2prt.1 ## Tests ## -TESTS = pmx.test -EXTRA_DIST += $(TESTS) +TESTS = $(PMX_TREE)/pmx.test TESTS_ENVIRONMENT = test_src=$(srcdir)/$(PMX_TREE)/tests -## pmx.test +## $(PMX_TREE)/pmx.test DISTCLEANFILES = barsant* pmxaerr.dat diff --git a/Build/source/utils/pmx/Makefile.in b/Build/source/utils/pmx/Makefile.in index 77b4d8fb804..a46810331bb 100644 --- a/Build/source/utils/pmx/Makefile.in +++ b/Build/source/utils/pmx/Makefile.in @@ -391,8 +391,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = $(PMX_TREE) $(PMX_TREE)-PATCHES ../../build-aux/relpath \ - $(TESTS) +EXTRA_DIST = $(PMX_TREE) $(PMX_TREE)-PATCHES ../../build-aux/relpath INCLUDES = -I$(srcdir)/$(PMX_TREE)/libf2c AM_CFLAGS = #$(WARNING_CFLAGS) pmxab_SOURCES = $(PMX_TREE)/pmxab.c @@ -493,7 +492,7 @@ all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) texmfdir = $(datarootdir)/$(scriptsdir) dist_texmf_SCRIPTS = $(lua_scripts:=.lua) dist_man1_MANS = pmx2pdf.1 pmxab.1 scor2prt.1 -TESTS = pmx.test +TESTS = $(PMX_TREE)/pmx.test TESTS_ENVIRONMENT = test_src=$(srcdir)/$(PMX_TREE)/tests DISTCLEANFILES = barsant* pmxaerr.dat all: all-am diff --git a/Build/source/utils/pmx/pmx-2.6.18/Makefile.am b/Build/source/utils/pmx/pmx-2.6.18/Makefile.am index d595ab06c79..39584c503bd 100644 --- a/Build/source/utils/pmx/pmx-2.6.18/Makefile.am +++ b/Build/source/utils/pmx/pmx-2.6.18/Makefile.am @@ -226,6 +226,7 @@ EXTRA_libf2c_a_SOURCES += \ ## Tests ## TESTS = pmx.test +TESTS_ENVIRONMENT = test_src=$(srcdir)/tests EXTRA_DIST = $(TESTS) PATCHES = PATCH-2.6.18-01 PATCH-2.6.18-02 diff --git a/Build/source/utils/pmx/pmx-2.6.18/pmx.test b/Build/source/utils/pmx/pmx-2.6.18/pmx.test index e2c9915fdb7..4c9860e66ae 100755 --- a/Build/source/utils/pmx/pmx-2.6.18/pmx.test +++ b/Build/source/utils/pmx/pmx-2.6.18/pmx.test @@ -5,21 +5,22 @@ rm -f barsant* pmxaerr.dat -cp $srcdir/tests/barsant.pmx . +cp $test_src/barsant.pmx . failed= ./scor2prt barsant \ - && diff barsant1.pmx $srcdir/tests/barsant1.pmx \ - && diff barsant2.pmx $srcdir/tests/barsant2.pmx \ - || failed="$failed scor2prt" + && diff barsant1.pmx $test_src/barsant1.pmx \ + && diff barsant2.pmx $test_src/barsant2.pmx \ + || failed="$failed scor2prt" ./pmxab barsant \ - && diff barsant.mid $srcdir/tests/barsant.mid \ - && diff barsant.pml $srcdir/tests/barsant.pml \ - && diff barsant.tex $srcdir/tests/barsant.tex \ - || failed="$failed pmxab" + && diff barsant.mid $test_src/barsant.mid \ + && diff barsant.pml $test_src/barsant.pml \ + && diff barsant.tex $test_src/barsant.tex \ + || failed="$failed pmxab" test -z "$failed" && exit 0 echo "failed tests:$failed" exit 1 + diff --git a/Build/source/utils/pmx/pmx.test b/Build/source/utils/pmx/pmx.test deleted file mode 100755 index 4c9860e66ae..00000000000 --- a/Build/source/utils/pmx/pmx.test +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org> -# You may freely use, modify and/or distribute this file. - -rm -f barsant* pmxaerr.dat - -cp $test_src/barsant.pmx . - -failed= - -./scor2prt barsant \ - && diff barsant1.pmx $test_src/barsant1.pmx \ - && diff barsant2.pmx $test_src/barsant2.pmx \ - || failed="$failed scor2prt" - -./pmxab barsant \ - && diff barsant.mid $test_src/barsant.mid \ - && diff barsant.pml $test_src/barsant.pml \ - && diff barsant.tex $test_src/barsant.tex \ - || failed="$failed pmxab" - -test -z "$failed" && exit 0 -echo "failed tests:$failed" -exit 1 - |