.

1 files changed, 43 insertions, 17 deletions

diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index 9521a9da0..4da78cda6 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -57,6 +57,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+AMTARFLAGS = @AMTARFLAGS@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -65,6 +66,7 @@ DATADIRNAME = @DATADIRNAME@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GNU_PACKAGE = @GNU_PACKAGE@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
 INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
@@ -82,6 +84,7 @@ POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
+TAR = @TAR@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
@@ -90,11 +93,9 @@ l = @l@
 
 
 x = pr
-explicit = 0F 0FF 0FFnt 0FFt 0FnFnt 0FnFt 0Fnt 0Ft 3-0F 3-5l17f-t 3-FF 3a2l17-FF 3a3f-0F 3a3l15-t 3a3l8f-t 3b2l17-FF 3b3f-0F 3b3f-0FF 3b3f-FF 3b3l15-t 3b3l8f-t 3f-0F 3f-FF 3l17f-t 3l24-t 3ml17f-t 3ml24-FF 3ml24-t 3ml24-t-FF 4-7l24-FF 4l24-FF FF FFn FFtn FnFn a2l15-FF a2l17-FF a3-0F a3f-0F a3f-0FF a3f-FF a3l15-t a3l17f-lm a3l8f-t b2l15-FF b2l17-FF b3-0F b3f-0F b3f-0FF b3f-FF b3l15-t b3l17f-lm b3l8f-t ja3l17f-lm jb3l17f-lm jml17f-lm-lo l17f-t l24-FF l24-t loli ml17f-0F ml17f-lm-lo ml17f-t ml17f-t-0F ml20-FF-t ml24-FF ml24-t ml24-t-FF n+2-5l17f-0FF n+2l17f-0FF n+2l17f-bl n+3-7l24-FF n+3l17f-0FF n+3l17f-bl n+3ml13f-bl-FF n+3ml17f-bl-tn n+3ml17f-tn-bl n+4-8a2l17-FF n+4b2l10f-0FF n+5-8b3l10f-FF n+5a3l6f-0FF n+6a2l17-FF n+6b3l6f-FF n+7l24-FF n+8l20-FF nN1+3l17f-bl nN15l17f-bl njml17f-lmlmlo njml17f-lmlolm nl17f-bl nsml13-bl-FF nsml13-t-t-FF nsml13-t-tFFFF nsml17-bl-FF nsml17-t-t-FF nsml17-t-tFFFF o3a3l17f-tn o3a3sl17f-tn o3a3snl17f-tn o3b3l17f-tn o3b3sl17f-tn o3b3snl17f-tn o3jml17f-lm-lo o3ml17f-bl-tn o3msl17f-bl-tn o3msnl17fbltn t-0FF t-FF t-bl t-t tFFn tFFt tFFt-bl tFFt-lm tFnFt ta3-0FF ta3-FF tb3-0FF tb3-FF tn tt-0FF tt-FF tt-bl tt-t tta3-0FF tta3-FF ttb3-0FF ttb3-FF w20l17f-lm w25l17f-lm w26l17f-lm w35a3l17f-lm w35b3l17f-lm w35ja3l17f-lm w35jb3l17f-lm w35jml17f-lmlo w35ml17f-lm-lo w48l17f-lm w72j-0FF
-
-maint_gen = margin-0.I margin-0.X dbl-sp-a.I dbl-sp-a.X dbl-sp-b.I dbl-sp-b.X
-run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O 1g.E 1h.O 1h.E 1i.O 1i.E 1j.O 1j.E 1k.O 1k.E 1l.O 1l.E 2a.O 2a.E 2b.O 2b.E 2c.O 2c.E 2d.O 2d.E 2e.O 2e.E 2f.O 2f.E 2g.O 2g.E 2h.O 2h.E 2i.O 2i.E 2j.O 2j.E 3a.O 3a.E 3b.O 3b.E 3c.O 3c.E 3d.O 3d.E 3e.O 3e.E 3f.O 3f.E 3g.O 3g.E 3h.O 3h.E 3i.O 3i.E 3j.O 3j.E 3k.O 3k.E 3l.O 3l.E 3m.O 3m.E 3la.O 3la.E 3lb.O 3lb.E 3lc.O 3lc.E 3ld.O 3ld.E 3le.O 3le.E 3lf.O 3lf.E 3aa.O 3aa.E 3ab.O 3ab.E 3ac.O 3ac.E 3ad.O 3ad.E 3ae.O 3ae.E 3af.O 3af.E 3ag.O 3ag.E 3ah.O 3ah.E 3ai.O 3ai.E 3aj.O 3aj.E 3ak.O 3ak.E 3ba.O 3ba.E 3bb.O 3bb.E 3bc.O 3bc.E 3bd.O 3bd.E 3be.O 3be.E 3bf.O 3bf.E 3bg.O 3bg.E 3bh.O 3bh.E 3bi.O 3bi.E 3bj.O 3bj.E 3bk.O 3bk.E 3Pa.O 3Pa.E 3Pb.O 3Pb.E 3Pc.O 3Pc.E 3Pd.O 3Pd.E 3Pe.O 3Pe.E 3Pf.O 3Pf.E 3Pg.O 3Pg.E 3Paa.O 3Paa.E 3Pab.O 3Pab.E 3Pac.O 3Pac.E 3Pad.O 3Pad.E 3Pae.O 3Pae.E 3Paf.O 3Paf.E 3Pba.O 3Pba.E 3Pbb.O 3Pbb.E 3Pbc.O 3Pbc.E 3Pbd.O 3Pbd.E 3Pbe.O 3Pbe.E 3Pbf.O 3Pbf.E 4a.O 4a.E 4b.O 4b.E 4c.O 4c.E 4d.O 4d.E 4e.O 4e.E 4f.O 4f.E 4g.O 4g.E 4h.O 4h.E 4i.O 4i.E 4j.O 4j.E 4k.O 4k.E 4l.O 4l.E 4m.O 4m.E 5a.O 5a.E 5b.O 5b.E 5c.O 5c.E 5d.O 5d.E 5e.O 5e.E 5f.O 5f.E 5g.O 5g.E 5ma.O 5ma.E 5mb.O 5mb.E 5mc.O 5mc.E 5md.O 5md.E 5Pma.O 5Pma.E 5Pmb.O 5Pmb.E 5Pmc.O 5Pmc.E 6a.O 6a.E 6b.O 6b.E 6c.O 6c.E 6d.O 6d.E 6e.O 6e.E 6f.O 6f.E 6g.O 6g.E 6aa.O 6aa.E 6ab.O 6ab.E 6ac.O 6ac.E 6ba.O 6ba.E 6bb.O 6bb.E 6bc.O 6bc.E 7a.O 7a.E 7b.O 7b.E 7c.O 7c.E 7d.O 7d.E 7e.O 7e.E 7f.O 7f.E 7g.O 7g.E 7aa.O 7aa.E 7ab.O 7ab.E 7ac.O 7ac.E 7ba.O 7ba.E 7bb.O 7bb.E 7bc.O 7bc.E 9a.O 9a.E 9b.O 9b.E 9Pa.O 9Pa.E 9Pb.O 9Pb.E 9Pc.O 9Pc.E 9Pe.O 9Pe.E 9Pf.O 9Pf.E 9Pg.O 9Pg.E 9Ph.O 9Ph.E 9Pi.O 9Pi.E 9Pj.O 9Pj.E 9Pk.O 9Pk.E 9Pl.O 9Pl.E 9Pm.O 9Pm.E 9Pn.O 9Pn.E 9Po.O 9Po.E 9Pp.O 9Pp.E 9Pq.O 9Pq.E 9Pr.O 9Pr.E 9Ps.O 9Ps.E 9Pt.O 9Pt.E 9Paa.O 9Paa.E 9Pab.O 9Pab.E 9Pac.O 9Pac.E 9Pad.O 9Pad.E 9Pae.O 9Pae.E 9Paf.O 9Paf.E 9Pag.O 9Pag.E 9Pah.O 9Pah.E 9Pai.O 9Pai.E 9Paj.O 9Paj.E 9Pak.O 9Pak.E 9Pba.O 9Pba.E 9Pbb.O 9Pbb.E 9Pbc.O 9Pbc.E 9Pbd.O 9Pbd.E 9Pbe.O 9Pbe.E 9Pbf.O 9Pbf.E 9Pbg.O 9Pbg.E 9Pbh.O 9Pbh.E 9Pbi.O 9Pbi.E 9Pbj.O 9Pbj.E 9Pbk.O 9Pbk.E 9Pma.O 9Pma.E 9Pmb.O 9Pmb.E 9Pmc.O 9Pmc.E 10a.O 10a.E 10b.O 10b.E 10c.O 10c.E 10d.O 10d.E 10e.O 10e.E 10ma.O 10ma.E 10mb.O 10mb.E 10mc.O 10mc.E 10md.O 10md.E 10me.O 10me.E 10mf.O 10mf.E 10aa.O 10aa.E 10ab.O 10ab.E 10ac.O 10ac.E 10ad.O 10ad.E 10ba.O 10ba.E 10bb.O 10bb.E 10bc.O 10bc.E 10bd.O 10bd.E 11a.O 11a.E 11b.O 11b.E 11e.O 11e.E 11f.O 11f.E 11g.O 11g.E 11h.O 11h.E 12aa.O 12aa.E 12ab.O 12ab.E 12ac.O 12ac.E 12ba.O 12ba.E 12bb.O 12bb.E 12bc.O 12bc.E 12ma.O 12ma.E 12mb.O 12mb.E 12mc.O 12mc.E 12md.O 12md.E margin-0.O margin-0.E dbl-sp-a.O dbl-sp-a.E dbl-sp-b.O dbl-sp-b.E
-
+explicit = 
+maint_gen = 
+run_gen = 
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
@@ -116,9 +117,8 @@ SCRIPTS =  $(noinst_SCRIPTS)
 DIST_COMMON =  Makefile.am Makefile.in
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -154,24 +154,50 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-TESTS: $(TESTS)
-	@failed=0; all=0; \
+	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
 	for tst in $(TESTS); do \
-	  if test -f $$tst; then dir=.; \
-	  else dir="$(srcdir)"; fi; \
-	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+	  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`; \
-	    echo "PASS: $$tst"; \
+	    case " $(XFAIL_TESTS) " in \
+	    *" $$tst "*) \
+	      xpass=`expr $$xpass + 1`; \
+	      failed=`expr $$failed + 1`; \
+	      echo "XPASS: $$tst"; \
+	    ;; \
+	    *) \
+	      echo "PASS: $$tst"; \
+	    ;; \
+	    esac; \
 	  elif test $$? -ne 77; then \
 	    all=`expr $$all + 1`; \
-	    failed=`expr $$failed + 1`; \
-	    echo "FAIL: $$tst"; \
+	    case " $(XFAIL_TESTS) " in \
+	    *" $$tst "*) \
+	      xfail=`expr $$xfail + 1`; \
+	      echo "XFAIL: $$tst"; \
+	    ;; \
+	    *) \
+	      failed=`expr $$failed + 1`; \
+	      echo "FAIL: $$tst"; \
+	    ;; \
+	    esac; \
 	  fi; \
 	done; \
 	if test "$$failed" -eq 0; then \
-	  banner="All $$all tests passed"; \
+	  if test "$$xfail" -eq 0; then \
+	    banner="All $$all tests passed"; \
+	  else \
+	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	  fi; \
 	else \
-	  banner="$$failed of $$all tests failed"; \
+	  if test "$$xpass" -eq 0; then \
+	    banner="$$failed of $$all tests failed"; \
+	  else \
+	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	  fi; \
 	fi; \
 	dashes=`echo "$$banner" | sed s/./=/g`; \
 	echo "$$dashes"; \
@@ -237,7 +263,7 @@ maintainer-clean: maintainer-clean-am
 .PHONY: tags distdir check-TESTS info-am info dvi-am dvi check check-am \
 installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
+all-redirect all-am all install-strip installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean