From: Stefano Lattarini Date: Sat, 2 Apr 2011 14:00:23 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~221 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d555ae188b43938b7d1742164e9ae774382d4edd;p=thirdparty%2Fautomake.git Merge branch 'maint' --- d555ae188b43938b7d1742164e9ae774382d4edd diff --cc automake.in index ef3b8a65b,d74730dcc..f9a682141 mode 100644,100755..100644 --- a/automake.in +++ b/automake.in diff --cc tests/Makefile.am index 05870853f,d4d947497..7f165ac46 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -24,10 -21,9 +24,11 @@@ all.test auxdir2.test \ cond17.test \ gcj6.test \ +override-conditional-2.test \ + pr8365-remake-timing.test \ txinfo5.test + include $(srcdir)/parallel-tests.am $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am @@@ -528,8 -429,7 +529,9 @@@ lex2.test lex3.test \ lex4.test \ lex5.test \ +lexcpp.test \ +lexvpath.test \ + lex-subobj-nodep.test \ lflags.test \ lflags2.test \ libexec.test \ @@@ -773,19 -642,8 +776,20 @@@ remake4.test remake5.test \ remake6.test \ remake7.test \ +remake8a.test \ +remake8b.test \ +remake9a.test \ +remake9b.test \ +remake9c.test \ +remake9d.test \ +remake10a.test \ +remake10b.test \ +remake10c.test \ +remake11.test \ +remake12.test \ + pr8365-remake-timing.test \ regex.test \ +regex-obsolete.test \ req.test \ reqd.test \ reqd2.test \ diff --cc tests/Makefile.in index 61cb70592,4d4c21f8d..d1e3a73eb --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -281,84 -272,43 +281,84 @@@ target_alias = @target_alias top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -XFAIL_TESTS = \ -all.test \ -auxdir2.test \ -cond17.test \ -gcj6.test \ -pr8365-remake-timing.test \ -txinfo5.test - -parallel_tests = \ -check-exported-srcdir-p.test \ -check-tests-in-builddir-p.test \ -check-tests_environment-p.test \ -check-p.test \ -check10-p.test \ -check11-p.test \ -check2-p.test \ -check3-p.test \ -check4-p.test \ -check5-p.test \ -check6-p.test \ -check7-p.test \ -check8-p.test \ -check9-p.test \ -color-p.test \ -color2-p.test \ -comment9-p.test \ -dejagnu-p.test \ -exeext4-p.test \ -maken3-p.test \ -maken4-p.test \ -pr401-p.test \ -pr401b-p.test \ -pr401c-p.test - -MAINTAINERCLEANFILES = $(parallel_tests) +MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests) +EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \ + $(TESTS) +XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \ - override-conditional-2.test txinfo5.test \ - $(instspc_xfail_tests) ++ override-conditional-2.test pr8365-remake-timing.test \ ++ txinfo5.test $(instspc_xfail_tests) +parallel_tests = backcompat5-p.test check-exported-srcdir-p.test \ + check-tests-in-builddir-p.test check-tests_environment-p.test \ + check-p.test check10-p.test check11-p.test check12-p.test \ + check2-p.test check3-p.test check4-p.test check5-p.test \ + check6-p.test check7-p.test check8-p.test check9-p.test \ + color-p.test color2-p.test comment9-p.test dejagnu-p.test \ + exeext4-p.test maken3-p.test maken4-p.test \ + posixsubst-tests-p.test pr401-p.test pr401b-p.test \ + pr401c-p.test +instspc_tests = instspc-squote-build.test instspc-squote-install.test \ + instspc-dquote-build.test instspc-dquote-install.test \ + instspc-bquote-build.test instspc-bquote-install.test \ + instspc-sharp-build.test instspc-sharp-install.test \ + instspc-dollar-build.test instspc-dollar-install.test \ + instspc-bang-build.test instspc-bang-install.test \ + instspc-bslash-build.test instspc-bslash-install.test \ + instspc-ampersand-build.test instspc-ampersand-install.test \ + instspc-percent-build.test instspc-percent-install.test \ + instspc-leftpar-build.test instspc-leftpar-install.test \ + instspc-rightpar-build.test instspc-rightpar-install.test \ + instspc-pipe-build.test instspc-pipe-install.test \ + instspc-caret-build.test instspc-caret-install.test \ + instspc-tilde-build.test instspc-tilde-install.test \ + instspc-qmark-build.test instspc-qmark-install.test \ + instspc-star-build.test instspc-star-install.test \ + instspc-plus-build.test instspc-plus-install.test \ + instspc-minus-build.test instspc-minus-install.test \ + instspc-comma-build.test instspc-comma-install.test \ + instspc-colon-build.test instspc-colon-install.test \ + instspc-semicol-build.test instspc-semicol-install.test \ + instspc-equal-build.test instspc-equal-install.test \ + instspc-less-build.test instspc-less-install.test \ + instspc-more-build.test instspc-more-install.test \ + instspc-at-build.test instspc-at-install.test \ + instspc-lqbrack-build.test instspc-lqbrack-install.test \ + instspc-rqbrack-build.test instspc-rqbrack-install.test \ + instspc-lcbrack-build.test instspc-lcbrack-install.test \ + instspc-rcbrack-build.test instspc-rcbrack-install.test \ + instspc-space-build.test instspc-space-install.test \ + instspc-tab-build.test instspc-tab-install.test \ + instspc-linefeed-build.test instspc-linefeed-install.test \ + instspc-backspace-build.test instspc-backspace-install.test \ + instspc-formfeed-build.test instspc-formfeed-install.test \ + instspc-carriageret-build.test \ + instspc-carriageret-install.test \ + instspc-quadrigraph0-build.test \ + instspc-quadrigraph0-install.test \ + instspc-quadrigraph1-build.test \ + instspc-quadrigraph1-install.test \ + instspc-quadrigraph2-build.test \ + instspc-quadrigraph2-install.test \ + instspc-quadrigraph3-build.test \ + instspc-quadrigraph3-install.test \ + instspc-quadrigraph4-build.test \ + instspc-quadrigraph4-install.test instspc-a_b-build.test \ + instspc-a_b-install.test instspc-a__b-build.test \ + instspc-a__b-install.test instspc-a_lf_b-build.test \ + instspc-a_lf_b-install.test instspc-dotdotdot-build.test \ + instspc-dotdotdot-install.test instspc-dosdrive-build.test \ + instspc-dosdrive-install.test instspc-miscglob1-build.test \ + instspc-miscglob1-install.test instspc-miscglob2-build.test \ + instspc-miscglob2-install.test +instspc_xfail_tests = instspc-squote-build.test \ + instspc-dquote-build.test instspc-bquote-build.test \ + instspc-sharp-build.test instspc-dollar-build.test \ + instspc-bslash-build.test instspc-ampersand-build.test \ + instspc-linefeed-build.test instspc-quadrigraph0-build.test \ + instspc-a_lf_b-build.test instspc-squote-install.test \ + instspc-dquote-install.test instspc-bquote-install.test \ + instspc-sharp-install.test instspc-dollar-install.test \ + instspc-linefeed-install.test instspc-a_lf_b-install.test TESTS = \ -aclibobj.test \ aclocal.test \ aclocal3.test \ aclocal4.test \ @@@ -790,8 -699,7 +790,9 @@@ lex2.test lex3.test \ lex4.test \ lex5.test \ +lexcpp.test \ +lexvpath.test \ + lex-subobj-nodep.test \ lflags.test \ lflags2.test \ libexec.test \ @@@ -1035,19 -912,8 +1037,20 @@@ remake4.test remake5.test \ remake6.test \ remake7.test \ +remake8a.test \ +remake8b.test \ +remake9a.test \ +remake9b.test \ +remake9c.test \ +remake9d.test \ +remake10a.test \ +remake10b.test \ +remake10c.test \ +remake11.test \ +remake12.test \ + pr8365-remake-timing.test \ regex.test \ +regex-obsolete.test \ req.test \ reqd.test \ reqd2.test \ diff --cc tests/maintclean.test index 471c8cea4,9e2246393..aeda04c30 --- a/tests/maintclean.test +++ b/tests/maintclean.test @@@ -19,8 -20,10 +21,8 @@@ . ./defs || Exit 1 -set -e - cat >> configure.in << 'END' - AC_CONFIG_FILES([bar]) + AC_CONFIG_FILES([bar sub/Makefile]) AC_OUTPUT END