diff options
-rw-r--r-- | m4/Makefile.in | 9 | ||||
-rw-r--r-- | tests/basename/Makefile.in | 63 | ||||
-rw-r--r-- | tests/date/Makefile.in | 78 | ||||
-rw-r--r-- | tests/factor/Makefile.in | 63 | ||||
-rw-r--r-- | tests/seq/Makefile.in | 3 | ||||
-rw-r--r-- | tests/stty/Makefile.in | 56 | ||||
-rw-r--r-- | tests/test/Makefile.in | 97 |
7 files changed, 301 insertions, 68 deletions
diff --git a/m4/Makefile.in b/m4/Makefile.in index 719afe911..005b87430 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -68,6 +68,7 @@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ DF_PROG = @DF_PROG@ GENCAT = @GENCAT@ +GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ GETCONF = @GETCONF@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -79,16 +80,24 @@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +KMEM_GROUP = @KMEM_GROUP@ LIBOBJS = @LIBOBJS@ +LIB_CRYPT = @LIB_CRYPT@ MAKEINFO = @MAKEINFO@ +MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ +NEED_SETGID = @NEED_SETGID@ +OPTIONAL_BIN_PROGS = @OPTIONAL_BIN_PROGS@ +OPTIONAL_BIN_ZCRIPTS = @OPTIONAL_BIN_ZCRIPTS@ MVDIR_PROG = @MVDIR_PROG@ PACKAGE = @PACKAGE@ PERL = @PERL@ POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ +SEQ_LIBM = @SEQ_LIBM@ +SQRT_LIBM = @SQRT_LIBM@ U = @U@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ diff --git a/tests/basename/Makefile.in b/tests/basename/Makefile.in index a0a7314df..00a7d7507 100644 --- a/tests/basename/Makefile.in +++ b/tests/basename/Makefile.in @@ -57,12 +57,17 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AMTAR = @AMTAR@ +AMTARFLAGS = @AMTARFLAGS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ +GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -104,17 +109,22 @@ AUTOMAKE_OPTIONS = 1.4 gnits TESTS = basic EXTRA_DIST = $(TESTS) -TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) srcdir=$(srcdir) PERL="@PERL@" PATH=../../src:$$PATH PROG=basename +TESTS_ENVIRONMENT = \ + top_srcdir=$(top_srcdir) \ + srcdir=$(srcdir) \ + PERL="@PERL@" \ + PATH=../../src:$$PATH \ + PROG=basename mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = +DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -149,25 +159,52 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ 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"; \ @@ -231,7 +268,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 diff --git a/tests/date/Makefile.in b/tests/date/Makefile.in index 437b7aae6..fb6c84655 100644 --- a/tests/date/Makefile.in +++ b/tests/date/Makefile.in @@ -57,12 +57,17 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AMTAR = @AMTAR@ +AMTARFLAGS = @AMTARFLAGS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ +GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -102,9 +107,25 @@ l = @l@ x = date explicit = -maint_gen = 1.X 2.X 3.X 4.X 5.X 6.X 7.X 8.X 9.X leap-1.X U95-1.X U95-2.X U95-3.X U92-1.X U92-2.X U92-3.X V92-1.X V92-2.X V92-3.X W92-1.X W92-2.X W92-3.X millen-1.X rel-0.X rel-1a.X rel-1b.X rel-2a.X rel-2b.X rel-2c.X rel-2d.X rel-2e.X rel-2f.X rel-2g.X rel-3a.X next-s.X next-m.X next-h.X next-d.X next-w.X next-mo.X next-y.X utc-0.X utc-0a.X utc-1.I utc-1.X utc-1a.I utc-1a.X date2sec-0.X date2sec-0a.X date2sec-1.X sec2date-0.X - -run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O 9.E leap-1.O leap-1.E U95-1.O U95-1.E U95-2.O U95-2.E U95-3.O U95-3.E U92-1.O U92-1.E U92-2.O U92-2.E U92-3.O U92-3.E V92-1.O V92-1.E V92-2.O V92-2.E V92-3.O V92-3.E W92-1.O W92-1.E W92-2.O W92-2.E W92-3.O W92-3.E millen-1.O millen-1.E rel-0.O rel-0.E rel-1a.O rel-1a.E rel-1b.O rel-1b.E rel-2a.O rel-2a.E rel-2b.O rel-2b.E rel-2c.O rel-2c.E rel-2d.O rel-2d.E rel-2e.O rel-2e.E rel-2f.O rel-2f.E rel-2g.O rel-2g.E rel-3a.O rel-3a.E next-s.O next-s.E next-m.O next-m.E next-h.O next-h.E next-d.O next-d.E next-w.O next-w.E next-mo.O next-mo.E next-y.O next-y.E utc-0.O utc-0.E utc-0a.O utc-0a.E utc-1.O utc-1.E utc-1a.O utc-1a.E date2sec-0.O date2sec-0.E date2sec-0a.O date2sec-0a.E date2sec-1.O date2sec-1.E sec2date-0.O sec2date-0.E +maint_gen = 1.X 2.X 3.X 4.X 5.X 6.X 7.X 8.X 9.X leap-1.X U95-1.X U95-2.X \ +U95-3.X U92-1.X U92-2.X U92-3.X V92-1.X V92-2.X V92-3.X W92-1.X W92-2.X \ +W92-3.X millen-1.X rel-0.X rel-1a.X rel-1b.X rel-2a.X rel-2b.X rel-2c.X \ +rel-2d.X rel-2e.X rel-2f.X rel-2g.X rel-3a.X next-s.X next-m.X next-h.X \ +next-d.X next-w.X next-mo.X next-y.X utc-0.X utc-0a.X utc-1.I utc-1.X \ +utc-1a.I utc-1a.X date2sec-0.X date2sec-0a.X date2sec-1.X sec2date-0.X + +run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \ +9.E leap-1.O leap-1.E U95-1.O U95-1.E U95-2.O U95-2.E U95-3.O U95-3.E U92-1.O \ +U92-1.E U92-2.O U92-2.E U92-3.O U92-3.E V92-1.O V92-1.E V92-2.O V92-2.E \ +V92-3.O V92-3.E W92-1.O W92-1.E W92-2.O W92-2.E W92-3.O W92-3.E millen-1.O \ +millen-1.E rel-0.O rel-0.E rel-1a.O rel-1a.E rel-1b.O rel-1b.E rel-2a.O \ +rel-2a.E rel-2b.O rel-2b.E rel-2c.O rel-2c.E rel-2d.O rel-2d.E rel-2e.O \ +rel-2e.E rel-2f.O rel-2f.E rel-2g.O rel-2g.E rel-3a.O rel-3a.E next-s.O \ +next-s.E next-m.O next-m.E next-h.O next-h.E next-d.O next-d.E next-w.O \ +next-w.E next-mo.O next-mo.E next-y.O next-y.E utc-0.O utc-0.E utc-0a.O \ +utc-0a.E utc-1.O utc-1.E utc-1a.O utc-1a.E date2sec-0.O date2sec-0.E \ +date2sec-0a.O date2sec-0a.E date2sec-1.O date2sec-1.E sec2date-0.O \ +sec2date-0.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) @@ -124,12 +145,12 @@ CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = SCRIPTS = $(noinst_SCRIPTS) +DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -164,25 +185,52 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ 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"; \ @@ -248,7 +296,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 diff --git a/tests/factor/Makefile.in b/tests/factor/Makefile.in index f0ebc3fe3..e519f2432 100644 --- a/tests/factor/Makefile.in +++ b/tests/factor/Makefile.in @@ -57,12 +57,17 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AMTAR = @AMTAR@ +AMTARFLAGS = @AMTARFLAGS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ +GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -104,17 +109,22 @@ AUTOMAKE_OPTIONS = 1.3b gnits TESTS = basic EXTRA_DIST = $(TESTS) -TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) srcdir=$(srcdir) PERL="@PERL@" PATH=../../src:$$PATH PROG=factor +TESTS_ENVIRONMENT = \ + top_srcdir=$(top_srcdir) \ + srcdir=$(srcdir) \ + PERL="@PERL@" \ + PATH=../../src:$$PATH \ + PROG=factor mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = +DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -149,25 +159,52 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ 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"; \ @@ -231,7 +268,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 diff --git a/tests/seq/Makefile.in b/tests/seq/Makefile.in index 1b83d0161..6c6679dcd 100644 --- a/tests/seq/Makefile.in +++ b/tests/seq/Makefile.in @@ -57,6 +57,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ AMTAR = @AMTAR@ AMTARFLAGS = @AMTARFLAGS@ CATALOGS = @CATALOGS@ @@ -65,6 +67,7 @@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ +GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff --git a/tests/stty/Makefile.in b/tests/stty/Makefile.in index 3b4394b7e..d4975538e 100644 --- a/tests/stty/Makefile.in +++ b/tests/stty/Makefile.in @@ -57,12 +57,17 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AMTAR = @AMTAR@ +AMTARFLAGS = @AMTARFLAGS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ +GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -108,12 +113,12 @@ TESTS_ENVIRONMENT = PATH=../../src:$$PATH mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = +DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -148,25 +153,52 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ 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"; \ @@ -230,7 +262,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 diff --git a/tests/test/Makefile.in b/tests/test/Makefile.in index 05799bacd..8f2e7ee9f 100644 --- a/tests/test/Makefile.in +++ b/tests/test/Makefile.in @@ -57,12 +57,17 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AMTAR = @AMTAR@ +AMTARFLAGS = @AMTARFLAGS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CPP = @CPP@ DATADIRNAME = @DATADIRNAME@ GENCAT = @GENCAT@ +GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -102,9 +107,44 @@ l = @l@ x = test explicit = -maint_gen = ne-1.X ne-2.X ne-3.X ne-4.X ne-5.X le-1.X le-2.X le-3.X le-4.X ge-1.X ge-2.X ge-3.X ge-4.X N-1b.X NN-1b.X N-1c.X NN-1c.X N-1d.X NN-1d.X N-streq-1.X NN-streq-1.X N-streq-2.X NN-streq-2.X N-strne-1.X NN-strne-1.X N-strne-2.X NN-strne-2.X N-and-1.X NN-and-1.X N-and-2.X NN-and-2.X N-and-3.X NN-and-3.X N-and-4.X NN-and-4.X N-or-1.X NN-or-1.X N-or-2.X NN-or-2.X N-or-3.X NN-or-3.X N-or-4.X NN-or-4.X N-eq-1.X NN-eq-1.X N-eq-2.X NN-eq-2.X N-eq-3.X NN-eq-3.X N-eq-4.X NN-eq-4.X N-eq-5.X NN-eq-5.X N-gt-1.X NN-gt-1.X N-gt-2.X NN-gt-2.X N-gt-3.X NN-gt-3.X N-gt-4.X NN-gt-4.X N-lt-1.X NN-lt-1.X N-lt-2.X NN-lt-2.X N-lt-3.X NN-lt-3.X N-lt-4.X NN-lt-4.X N-t2.X NN-t2.X 1a.X 1b.X 1c.X 1d.X streq-1.X streq-2.X strne-1.X strne-2.X and-1.X and-2.X and-3.X and-4.X or-1.X or-2.X or-3.X or-4.X eq-1.X eq-2.X eq-3.X eq-4.X eq-5.X gt-1.X gt-2.X gt-3.X gt-4.X lt-1.X lt-2.X lt-3.X lt-4.X inv-1.X t1.X t2.X - -run_gen = ne-1.O ne-1.E ne-2.O ne-2.E ne-3.O ne-3.E ne-4.O ne-4.E ne-5.O ne-5.E le-1.O le-1.E le-2.O le-2.E le-3.O le-3.E le-4.O le-4.E ge-1.O ge-1.E ge-2.O ge-2.E ge-3.O ge-3.E ge-4.O ge-4.E N-1b.O N-1b.E NN-1b.O NN-1b.E N-1c.O N-1c.E NN-1c.O NN-1c.E N-1d.O N-1d.E NN-1d.O NN-1d.E N-streq-1.O N-streq-1.E NN-streq-1.O NN-streq-1.E N-streq-2.O N-streq-2.E NN-streq-2.O NN-streq-2.E N-strne-1.O N-strne-1.E NN-strne-1.O NN-strne-1.E N-strne-2.O N-strne-2.E NN-strne-2.O NN-strne-2.E N-and-1.O N-and-1.E NN-and-1.O NN-and-1.E N-and-2.O N-and-2.E NN-and-2.O NN-and-2.E N-and-3.O N-and-3.E NN-and-3.O NN-and-3.E N-and-4.O N-and-4.E NN-and-4.O NN-and-4.E N-or-1.O N-or-1.E NN-or-1.O NN-or-1.E N-or-2.O N-or-2.E NN-or-2.O NN-or-2.E N-or-3.O N-or-3.E NN-or-3.O NN-or-3.E N-or-4.O N-or-4.E NN-or-4.O NN-or-4.E N-eq-1.O N-eq-1.E NN-eq-1.O NN-eq-1.E N-eq-2.O N-eq-2.E NN-eq-2.O NN-eq-2.E N-eq-3.O N-eq-3.E NN-eq-3.O NN-eq-3.E N-eq-4.O N-eq-4.E NN-eq-4.O NN-eq-4.E N-eq-5.O N-eq-5.E NN-eq-5.O NN-eq-5.E N-gt-1.O N-gt-1.E NN-gt-1.O NN-gt-1.E N-gt-2.O N-gt-2.E NN-gt-2.O NN-gt-2.E N-gt-3.O N-gt-3.E NN-gt-3.O NN-gt-3.E N-gt-4.O N-gt-4.E NN-gt-4.O NN-gt-4.E N-lt-1.O N-lt-1.E NN-lt-1.O NN-lt-1.E N-lt-2.O N-lt-2.E NN-lt-2.O NN-lt-2.E N-lt-3.O N-lt-3.E NN-lt-3.O NN-lt-3.E N-lt-4.O N-lt-4.E NN-lt-4.O NN-lt-4.E N-t2.O N-t2.E NN-t2.O NN-t2.E 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E streq-1.O streq-1.E streq-2.O streq-2.E strne-1.O strne-1.E strne-2.O strne-2.E and-1.O and-1.E and-2.O and-2.E and-3.O and-3.E and-4.O and-4.E or-1.O or-1.E or-2.O or-2.E or-3.O or-3.E or-4.O or-4.E eq-1.O eq-1.E eq-2.O eq-2.E eq-3.O eq-3.E eq-4.O eq-4.E eq-5.O eq-5.E gt-1.O gt-1.E gt-2.O gt-2.E gt-3.O gt-3.E gt-4.O gt-4.E lt-1.O lt-1.E lt-2.O lt-2.E lt-3.O lt-3.E lt-4.O lt-4.E inv-1.O inv-1.E t1.O t1.E t2.O t2.E +maint_gen = ne-1.X ne-2.X ne-3.X ne-4.X ne-5.X le-1.X le-2.X le-3.X le-4.X \ +ge-1.X ge-2.X ge-3.X ge-4.X N-1b.X NN-1b.X N-1c.X NN-1c.X N-1d.X NN-1d.X \ +N-streq-1.X NN-streq-1.X N-streq-2.X NN-streq-2.X N-strne-1.X NN-strne-1.X \ +N-strne-2.X NN-strne-2.X N-and-1.X NN-and-1.X N-and-2.X NN-and-2.X N-and-3.X \ +NN-and-3.X N-and-4.X NN-and-4.X N-or-1.X NN-or-1.X N-or-2.X NN-or-2.X \ +N-or-3.X NN-or-3.X N-or-4.X NN-or-4.X N-eq-1.X NN-eq-1.X N-eq-2.X NN-eq-2.X \ +N-eq-3.X NN-eq-3.X N-eq-4.X NN-eq-4.X N-eq-5.X NN-eq-5.X N-gt-1.X NN-gt-1.X \ +N-gt-2.X NN-gt-2.X N-gt-3.X NN-gt-3.X N-gt-4.X NN-gt-4.X N-lt-1.X NN-lt-1.X \ +N-lt-2.X NN-lt-2.X N-lt-3.X NN-lt-3.X N-lt-4.X NN-lt-4.X N-t2.X NN-t2.X 1a.X \ +1b.X 1c.X 1d.X streq-1.X streq-2.X strne-1.X strne-2.X and-1.X and-2.X \ +and-3.X and-4.X or-1.X or-2.X or-3.X or-4.X eq-1.X eq-2.X eq-3.X eq-4.X \ +eq-5.X gt-1.X gt-2.X gt-3.X gt-4.X lt-1.X lt-2.X lt-3.X lt-4.X inv-1.X t1.X \ +t2.X + +run_gen = ne-1.O ne-1.E ne-2.O ne-2.E ne-3.O ne-3.E ne-4.O ne-4.E ne-5.O \ +ne-5.E le-1.O le-1.E le-2.O le-2.E le-3.O le-3.E le-4.O le-4.E ge-1.O ge-1.E \ +ge-2.O ge-2.E ge-3.O ge-3.E ge-4.O ge-4.E N-1b.O N-1b.E NN-1b.O NN-1b.E \ +N-1c.O N-1c.E NN-1c.O NN-1c.E N-1d.O N-1d.E NN-1d.O NN-1d.E N-streq-1.O \ +N-streq-1.E NN-streq-1.O NN-streq-1.E N-streq-2.O N-streq-2.E NN-streq-2.O \ +NN-streq-2.E N-strne-1.O N-strne-1.E NN-strne-1.O NN-strne-1.E N-strne-2.O \ +N-strne-2.E NN-strne-2.O NN-strne-2.E N-and-1.O N-and-1.E NN-and-1.O \ +NN-and-1.E N-and-2.O N-and-2.E NN-and-2.O NN-and-2.E N-and-3.O N-and-3.E \ +NN-and-3.O NN-and-3.E N-and-4.O N-and-4.E NN-and-4.O NN-and-4.E N-or-1.O \ +N-or-1.E NN-or-1.O NN-or-1.E N-or-2.O N-or-2.E NN-or-2.O NN-or-2.E N-or-3.O \ +N-or-3.E NN-or-3.O NN-or-3.E N-or-4.O N-or-4.E NN-or-4.O NN-or-4.E N-eq-1.O \ +N-eq-1.E NN-eq-1.O NN-eq-1.E N-eq-2.O N-eq-2.E NN-eq-2.O NN-eq-2.E N-eq-3.O \ +N-eq-3.E NN-eq-3.O NN-eq-3.E N-eq-4.O N-eq-4.E NN-eq-4.O NN-eq-4.E N-eq-5.O \ +N-eq-5.E NN-eq-5.O NN-eq-5.E N-gt-1.O N-gt-1.E NN-gt-1.O NN-gt-1.E N-gt-2.O \ +N-gt-2.E NN-gt-2.O NN-gt-2.E N-gt-3.O N-gt-3.E NN-gt-3.O NN-gt-3.E N-gt-4.O \ +N-gt-4.E NN-gt-4.O NN-gt-4.E N-lt-1.O N-lt-1.E NN-lt-1.O NN-lt-1.E N-lt-2.O \ +N-lt-2.E NN-lt-2.O NN-lt-2.E N-lt-3.O N-lt-3.E NN-lt-3.O NN-lt-3.E N-lt-4.O \ +N-lt-4.E NN-lt-4.O NN-lt-4.E N-t2.O N-t2.E NN-t2.O NN-t2.E 1a.O 1a.E 1b.O \ +1b.E 1c.O 1c.E 1d.O 1d.E streq-1.O streq-1.E streq-2.O streq-2.E strne-1.O \ +strne-1.E strne-2.O strne-2.E and-1.O and-1.E and-2.O and-2.E and-3.O and-3.E \ +and-4.O and-4.E or-1.O or-1.E or-2.O or-2.E or-3.O or-3.E or-4.O or-4.E \ +eq-1.O eq-1.E eq-2.O eq-2.E eq-3.O eq-3.E eq-4.O eq-4.E eq-5.O eq-5.E gt-1.O \ +gt-1.E gt-2.O gt-2.E gt-3.O gt-3.E gt-4.O gt-4.E lt-1.O lt-1.E lt-2.O lt-2.E \ +lt-3.O lt-3.E lt-4.O lt-4.E inv-1.O inv-1.E t1.O t1.E t2.O t2.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) @@ -124,12 +164,12 @@ CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = SCRIPTS = $(noinst_SCRIPTS) +DIST_SOURCES = DIST_COMMON = Makefile.am Makefile.in -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -164,25 +204,52 @@ distdir: $(DISTFILES) || cp -p $$d/$$file $(distdir)/$$file || :; \ 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"; \ @@ -248,7 +315,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 |