makejvf: add a test case for 'make check'

git-svn-id: svn://tug.org/texlive/trunk@18080 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 141 insertions, 5 deletions

diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog
index 7055f213b2b..f8b06495336 100644
--- a/Build/source/texk/makejvf/ChangeLog
+++ b/Build/source/texk/makejvf/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* makejvf.test (new): Shell script for 'make check' test.
+	* tests/[t]min10.{tfm,vf}, tests/rml[v].tfm (new): Test data.
+	* Makefile.am: Adjust.
+
 2010-04-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* write.c (writevf): Initialize height.  From Sadayuki Tanaka
diff --git a/Build/source/texk/makejvf/Makefile.am b/Build/source/texk/makejvf/Makefile.am
index c29ed5fcd7b..7fd74864057 100644
--- a/Build/source/texk/makejvf/Makefile.am
+++ b/Build/source/texk/makejvf/Makefile.am
@@ -23,6 +23,20 @@ LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS)
 
 EXTRA_DIST = COPYRIGHT COPYRIGHT.jis Changes.txt README.txt
 
+dist_check_SCRIPTS = makejvf.test
+
+TESTS = makejvf.test
+
+EXTRA_DIST += \
+	tests/min10.tfm \
+	tests/min10.vf \
+	tests/rml.tfm \
+	tests/rmlv.tfm \
+	tests/tmin10.tfm \
+	tests/tmin10.vf
+
+DISTCLEANFILES = min10.vf rml.tfm rmlv.tfm tmin10.vf
+
 ## Eventually delete this file
 ##
 EXTRA_DIST += \
diff --git a/Build/source/texk/makejvf/Makefile.in b/Build/source/texk/makejvf/Makefile.in
index 6f2eb9816c1..2dc2b9b4844 100644
--- a/Build/source/texk/makejvf/Makefile.in
+++ b/Build/source/texk/makejvf/Makefile.in
@@ -36,7 +36,7 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = makejvf$(EXEEXT)
 subdir = .
-DIST_COMMON = $(am__configure_deps) \
+DIST_COMMON = $(am__configure_deps) $(dist_check_SCRIPTS) \
 	$(srcdir)/../../build-aux/config.guess \
 	$(srcdir)/../../build-aux/config.sub \
 	$(srcdir)/../../build-aux/depcomp \
@@ -93,6 +93,8 @@ SOURCES = $(makejvf_SOURCES)
 DIST_SOURCES = $(makejvf_SOURCES)
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -233,7 +235,11 @@ makejvf_SOURCES = \
 
 LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS)
 EXTRA_DIST = COPYRIGHT COPYRIGHT.jis Changes.txt README.txt \
-	Makefile.orig
+	tests/min10.tfm tests/min10.vf tests/rml.tfm tests/rmlv.tfm \
+	tests/tmin10.tfm tests/tmin10.vf Makefile.orig
+dist_check_SCRIPTS = makejvf.test
+TESTS = makejvf.test
+DISTCLEANFILES = min10.vf rml.tfm rmlv.tfm tmin10.vf
 all: c-auto.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -430,6 +436,98 @@ GTAGS:
 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; 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 \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes$$std"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
+
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
@@ -578,6 +676,8 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(dist_check_SCRIPTS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile $(PROGRAMS) c-auto.h
 installdirs:
@@ -605,6 +705,7 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -682,10 +783,10 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: all install-am install-strip
+.MAKE: all check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-binPROGRAMS clean-generic clean-libtool ctags dist \
+.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
+	clean clean-binPROGRAMS clean-generic clean-libtool ctags dist \
 	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
 	dist-xz dist-zip distcheck distclean distclean-compile \
 	distclean-generic distclean-hdr distclean-libtool \
diff --git a/Build/source/texk/makejvf/makejvf.test b/Build/source/texk/makejvf/makejvf.test
new file mode 100755
index 00000000000..f09e48b28a5
--- /dev/null
+++ b/Build/source/texk/makejvf/makejvf.test
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+./makejvf $srcdir/tests/min10.tfm rml && \
+  cmp $srcdir/tests/rml.tfm rml.tfm || exit 1
+
+cmp $srcdir/tests/min10.vf min10.vf || :
+
+./makejvf $srcdir/tests/tmin10 rmlv && \
+  cmp $srcdir/tests/rmlv.tfm rmlv.tfm || exit 1
+
+cmp $srcdir/tests/tmin10.vf tmin10.vf || :
+
diff --git a/Build/source/texk/makejvf/tests/min10.tfm b/Build/source/texk/makejvf/tests/min10.tfm
new file mode 100644
index 00000000000..1bf04b7ac32
--- /dev/null
+++ b/Build/source/texk/makejvf/tests/min10.tfm
diff --git a/Build/source/texk/makejvf/tests/min10.vf b/Build/source/texk/makejvf/tests/min10.vf
new file mode 100644
index 00000000000..e4f053f6610
--- /dev/null
+++ b/Build/source/texk/makejvf/tests/min10.vf
diff --git a/Build/source/texk/makejvf/tests/rml.tfm b/Build/source/texk/makejvf/tests/rml.tfm
new file mode 100644
index 00000000000..8dbf787b3ec
--- /dev/null
+++ b/Build/source/texk/makejvf/tests/rml.tfm
diff --git a/Build/source/texk/makejvf/tests/rmlv.tfm b/Build/source/texk/makejvf/tests/rmlv.tfm
new file mode 100644
index 00000000000..dddd9776408
--- /dev/null
+++ b/Build/source/texk/makejvf/tests/rmlv.tfm
diff --git a/Build/source/texk/makejvf/tests/tmin10.tfm b/Build/source/texk/makejvf/tests/tmin10.tfm
new file mode 100644
index 00000000000..a54690f5656
--- /dev/null
+++ b/Build/source/texk/makejvf/tests/tmin10.tfm
diff --git a/Build/source/texk/makejvf/tests/tmin10.vf b/Build/source/texk/makejvf/tests/tmin10.vf
new file mode 100644
index 00000000000..b6bd7630bb8
--- /dev/null
+++ b/Build/source/texk/makejvf/tests/tmin10.vf