]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into ng/master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 11 Apr 2012 14:35:09 +0000 (16:35 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 11 Apr 2012 15:34:02 +0000 (17:34 +0200)
* master:
  vala tests: force the use of automatic dependency tracking
  tests: avoid spurious failures in tests on C++ and lex
  tests: avoid spurious failures with non-flex 'lex' programs and C++
  tests: avoid a spurious failures for shells with busted 'set -e'
  maint: simplify generation of files with @substed@ stuff
  tests: remove redundant requirement
  tests: make two test scripts executable
  t/README: update w.r.t. recent overhaul (non-recursive build system)
  docs: fix names of relevant test cases in comments
  NEWS: automake build systems avoids make recursion
  maint: no more make recursion in Automake's build system
  tests: rename 'tests/' => 't/', '*.test' => '*.sh'
  tests: remove recipes that run tests with 'prove'
  tests: move most helper scripts and files into the 'ax' subdirectory
  maint: remove most recursion in automake's own build system
  tests: fix a spurious failures with non-GNU make

+ Extra non-trivial edits:

* Makefile.am: Remove new uses of 'AM_MAKEFLAGS' throughout.
(dist_automake_ac_DATA): Do not list 'm4/depout.m4' nor
'm4/make.m4'.
* syntax-checks.m4: Use '$(xdefs)' instead of hard-coding the
older paths of 'defs' and 'defs-static.in'.  Use 't/README'
instead of 'tests/README'.
* t/instdir-no-empty.sh: Remove uses of 'AM_MAKEFLAGS'.
* tests/depcomp-recover.test: Renamed ...
* t/depcomp-recover.sh: ... to this.
* tests/gmake-vars.test: Renamed ...
* t/gmake-vars.sh: ... to this.
* tests/interp3.test: Renamed ...
* t/interp3.sh: ... to this.
* tests/objdir.test: Renamed ...
* t/objdir.sh: ... to this.
* tests/spy-vpath-rewrite.test: Renamed ...
* t/spy-vpath-rewrite.sh: ... to this.
* tests/vpath-rewrite.test: Renamed ...
* t/vpath-rewrite.sh: ... to this.
* tests/yacc-subobj-nodep.test: Renamed ...
* t/yacc-subobj-nodep.sh: ... to this.
* tests/depcomp-shuffle.sh: Renamed ...
* t/ax/depcomp-shuffle.sh: ... to this, and removed executable bit.
* t/depcomp-shuffle-sub-vpath.sh: Adjust.
* t/depcomp-shuffle-sub.sh: Likewise.
* t/depcomp-shuffle-vpath.sh: Likewise.
* t/depcomp-shuffle.sh: Likewise.
* gen-testsuite-part: Likewise.
* t/list-of-tests.mk: Do not list tests that had been already
removed from the Automake-NG testsuite.  Take into account the
renames above.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
229 files changed:
1  2 
.gitignore
Makefile.am
README
configure.ac
defs
doc/automake.texi
gen-testsuite-part
syntax-checks.mk
t/README
t/aclocal4.sh
t/amopts-variable-expansion.sh
t/ax/depcomp-shuffle.sh
t/ax/tap-summary-aux.sh
t/ax/testsuite-summary-checks.sh
t/canon.sh
t/canon5.sh
t/check-concurrency-bug9245.sh
t/check10.sh
t/check11.sh
t/check12.sh
t/check4.sh
t/check5.sh
t/check7.sh
t/check8.sh
t/color.sh
t/conffile-leading-dot.sh
t/cscope.tap
t/depcomp-recover.sh
t/depcomp-shuffle-sub-vpath.sh
t/depcomp-shuffle-sub.sh
t/depcomp-shuffle-vpath.sh
t/depcomp-shuffle.sh
t/depend.sh
t/depend4.sh
t/distcheck-configure-flags.sh
t/distcheck-hook.sh
t/distcheck-hook2.sh
t/distcheck-missing-m4.sh
t/distcheck-outdated-m4.sh
t/distcheck-override-infodir.sh
t/distdir.sh
t/distlinksbrk.sh
t/dollar.sh
t/exeext.sh
t/exsource.sh
t/extra10.sh
t/extra11.sh
t/extra12.sh
t/fort2.sh
t/gmake-vars.sh
t/gnits2.sh
t/gnits3.sh
t/gnumake.sh
t/instdir-java.sh
t/instdir-lisp.sh
t/instdir-ltlib.sh
t/instdir-no-empty.sh
t/instdir-prog.sh
t/instdir-python.sh
t/instdir-texi.sh
t/instdir.sh
t/instdir2.sh
t/insthook.sh
t/instmany-mans.sh
t/instmany-python.sh
t/instmany.sh
t/instspc.tap
t/interp3.sh
t/java-compile-run-flat.sh
t/java-compile-run-nested.sh
t/javaflags.sh
t/lex-depend-cxx.sh
t/lex-depend.sh
t/lex-lib-external.sh
t/lex-libobj.sh
t/lex-noyywrap.sh
t/lex3.sh
t/lex5.sh
t/lflags.sh
t/lflags2.sh
t/libobj19.sh
t/libtool9.sh
t/link_cond.sh
t/lisp8.sh
t/list-of-tests.mk
t/make-dryrun.tap
t/makej.sh
t/maken.sh
t/maken3.sh
t/man3.sh
t/man6.sh
t/man8.sh
t/mmodely.sh
t/multlib.sh
t/objdir.sh
t/output6.sh
t/parallel-tests-cmdline-override.sh
t/parallel-tests-empty-testlogs.sh
t/parallel-tests-exit-statuses.sh
t/parallel-tests-extra-programs.sh
t/parallel-tests-fork-bomb.sh
t/parallel-tests-harderror.sh
t/parallel-tests-log-compiler-1.sh
t/parallel-tests-log-override-1.sh
t/parallel-tests-log-override-2.sh
t/parallel-tests-log-override-recheck.sh
t/parallel-tests-many.sh
t/parallel-tests-no-color-in-log.sh
t/parallel-tests.sh
t/parallel-tests2.sh
t/parallel-tests3.sh
t/parallel-tests5.sh
t/parallel-tests8.sh
t/pattern-rules.sh
t/pattern-rules2.sh
t/pr8365-remake-timing.sh
t/python-virtualenv.sh
t/remake-all-1.sh
t/remake-deleted-m4-file.sh
t/remake-gnulib-add-acsubst.sh
t/remake-gnulib-add-header.sh
t/remake-gnulib-remove-header.sh
t/remake-moved-m4-file.sh
t/remake-renamed-am.sh
t/remake-renamed-m4-file.sh
t/remake-renamed-m4-macro-and-file.sh
t/remake-renamed-m4-macro.sh
t/remake-subdir-from-subdir.sh
t/remake-subdir-gnu.sh
t/remake-subdir-long-time.sh
t/remake-subdir.sh
t/remake10a.sh
t/remake10b.sh
t/remake10c.sh
t/remake12.sh
t/remake5.sh
t/remake8a.sh
t/remake8b.sh
t/remake9a.sh
t/remake9b.sh
t/remake9c.sh
t/remake9d.sh
t/silent6.sh
t/spy-vpath-rewrite.sh
t/subobj11a.sh
t/subobj11c.sh
t/subobj4.sh
t/subpkg-yacc.sh
t/subst-no-trailing-empty-line.sh
t/suffix-chain.tap
t/suffix10.tap
t/suffix11.tap
t/suffix12.sh
t/suffix13.sh
t/suffix3.tap
t/suffix5.sh
t/suffix6b.sh
t/suffix6c.sh
t/suffix8.tap
t/tap-autonumber.sh
t/tap-bailout-leading-space.sh
t/tap-bailout-suppress-later-errors.sh
t/tap-bailout.sh
t/tap-basic.sh
t/tap-color.sh
t/tap-diagnostic.sh
t/tap-doc2.sh
t/tap-global-log.sh
t/tap-global-result.sh
t/tap-log.sh
t/tap-merge-stdout-stderr.sh
t/tap-msg0-bailout.sh
t/tap-msg0-planskip.sh
t/tap-out-of-order.sh
t/tap-passthrough-exit.sh
t/tap-passthrough.sh
t/tap-plan-corner.sh
t/tap-plan-leading-zero.sh
t/tap-plan-malformed.sh
t/tap-plan-middle.sh
t/tap-plan-whitespace.sh
t/tap-plan.sh
t/tap-planskip-and-logging.sh
t/tap-planskip-case-insensitive.sh
t/tap-planskip-late.sh
t/tap-planskip-unplanned-corner.sh
t/tap-planskip-whitespace.sh
t/tap-planskip.sh
t/tap-realtime.sh
t/tap-recheck-logs.sh
t/tap-test-number-0.sh
t/tap-unplanned.sh
t/test-driver-custom-multitest-recheck2.sh
t/test-driver-custom-multitest.sh
t/test-driver-custom-xfail-tests.sh
t/test-log.sh
t/test-missing.sh
t/test-trs-basic.sh
t/test-trs-recover.sh
t/test-trs-recover2.sh
t/testsuite-summary-reference-log.sh
t/txinfo21.sh
t/vala-mix.sh
t/vala-mix2.sh
t/vala-vpath.sh
t/vala2.sh
t/vala3.sh
t/vala5.sh
t/vars-assign.sh
t/version4.sh
t/version7.sh
t/vpath-rewrite.sh
t/warning-groups-win-over-strictness.sh
t/warnings-override.sh
t/warnings-precedence.sh
t/warnings-strictness-interactions.sh
t/warnings-win-over-strictness.sh
t/yacc-basic.sh
t/yacc-bison-skeleton-cxx.sh
t/yacc-bison-skeleton.sh
t/yacc-cxx.sh
t/yacc-d-basic.sh
t/yacc-d-cxx.sh
t/yacc-dist-nobuild-subdir.sh
t/yacc-nodist.sh
t/yacc-subobj-nodep.sh
t/yflags-cmdline-override.sh
t/yflags.sh
t/yflags2.sh

diff --cc .gitignore
index 6e995f18684ce13f8c7a12c845c973da23089560,78b7affb9aa6404259fd842e64336de38664ec35..87dc8e76f9c04b69030ac1a4285ccfe4710823b3
  /doc/amhello/install-sh
  /doc/amhello/missing
  /lib/Automake/Config.pm
- /tests/wrap/aclocal-*
- /tests/wrap/automake-*
- /tests/defs-static
- /tests/testsuite-part.am
- /tests/*-w.tap
- /tests/*-w.test
- /tests/depcomp-*.tap
- /tests/*.dir
- /tests/*.log
- /tests/*.trs
- /tests/pm/*.log
- /tests/pm/*.trs
+ /test-suite.log
 -/t/wrap/aclocal-1.*
 -/t/wrap/automake-1.*
++/t/wrap/aclocal-0.*
++/t/wrap/automake-0.*
+ /defs-static
+ /t/testsuite-part.am
+ /t/*-w.tap
+ /t/*-w.sh
+ /t/depcomp-*.tap
+ /t/*.dir
+ /t/*.log
+ /t/*.trs
+ /t/pm/*.log
+ /t/pm/*.trs
  cscope.files
  cscope.in.out
  cscope.out
diff --cc Makefile.am
index 005512b72482261bc186d0fc3b4516f48b646833,991de4c3239237d524f22ffdbe0ed0bc76591a76..87657542f6d7335e338b43c676b4c63d71e8a924
@@@ -115,11 -115,458 +128,456 @@@ INSTALL: lib/INSTAL
  maintainer-clean-local:
        rm -rf .autom4te.cache
  
- ################################################################
- ##
+ ## -------------------------------------------------------------------- ##
+ ##  Auxiliary scripts and files for use with "automake --add-missing".  ##
+ ## -------------------------------------------------------------------- ##
+ dist_pkgvdata_DATA = \
+   lib/COPYING \
+   lib/INSTALL \
+   lib/texinfo.tex
+ ## These must all be executable when installed.  However, if we use
+ ## _SCRIPTS, then the program transform will be applied, which is not
+ ## what we want.  So we make them executable by hand.
+ dist_script_DATA = \
+   lib/config.guess \
+   lib/config.sub \
+   lib/install-sh \
+   lib/mdate-sh \
+   lib/missing \
+   lib/mkinstalldirs \
+   lib/elisp-comp \
+   lib/ylwrap \
+   lib/depcomp \
+   lib/compile \
+   lib/py-compile \
+   lib/ar-lib \
+   lib/test-driver \
+   lib/tap-driver.sh \
+   lib/tap-driver.pl
+ install-data-hook:
+       @$(POST_INSTALL)
+       @for f in $(dist_script_DATA); do echo $$f; done \
+         | sed 's,^lib/,,' \
+         | ( st=0; \
+             while read f; do \
+               echo " chmod +x '$(DESTDIR)$(scriptdir)/$$f'"; \
+               chmod +x "$(DESTDIR)$(scriptdir)/$$f" || st=1; \
+             done; \
+             exit $$st )
+ installcheck-local: installcheck-executable-scripts
+ installcheck-executable-scripts:
+       @for f in $(dist_script_DATA); do echo $$f; done \
+         | sed 's,^lib/,,' \
+         | while read f; do \
+             path="$(pkgvdatadir)/$$f"; \
+             test -x "$$path" || echo $$path; \
+           done \
+         | sed 's/$$/: not executable/' \
+         | grep . 1>&2 && exit 1; exit 0
+ ## ---------------------------------------------------- ##
+ ##  Private perl modules used by automake and aclocal.  ##
+ ## ---------------------------------------------------- ##
+ perllibdir = $(pkgvdatadir)/Automake
+ dist_perllib_DATA = \
+   lib/Automake/ChannelDefs.pm \
+   lib/Automake/Channels.pm \
+   lib/Automake/Condition.pm \
+   lib/Automake/Configure_ac.pm \
+   lib/Automake/DisjConditions.pm \
+   lib/Automake/FileUtils.pm \
+   lib/Automake/General.pm \
+   lib/Automake/Getopt.pm \
+   lib/Automake/Item.pm \
+   lib/Automake/ItemDef.pm \
+   lib/Automake/Location.pm \
+   lib/Automake/Options.pm \
+   lib/Automake/Rule.pm \
+   lib/Automake/RuleDef.pm \
+   lib/Automake/Variable.pm \
+   lib/Automake/VarDef.pm \
+   lib/Automake/Version.pm \
+   lib/Automake/XFile.pm \
+   lib/Automake/Wrap.pm
+ nodist_perllib_DATA = lib/Automake/Config.pm
+ CLEANFILES += $(nodist_perllib_DATA)
+ lib/Automake/Config.pm: lib/Automake/Config.in Makefile
+       $(AM_V_at)rm -f $@ $@-t
+       $(AM_V_at)test -d lib/Automake || $(MKDIR_P) lib/Automake
+       $(AM_V_GEN)in=Config.in \
+         && $(do_subst) <$(srcdir)/lib/Automake/Config.in >$@-t
+       $(generated_file_finalize)
+ EXTRA_DIST += lib/Automake/Config.in
+ ## --------------------- ##
+ ##  Makefile fragments.  ##
+ ## --------------------- ##
+ dist_am_DATA = \
+   lib/am/check.am \
+   lib/am/check2.am \
+   lib/am/clean-hdr.am \
+   lib/am/clean.am \
+   lib/am/compile.am \
+   lib/am/configure.am \
+   lib/am/data.am \
+   lib/am/dejagnu.am \
+   lib/am/depend.am \
+   lib/am/depend2.am \
+   lib/am/distdir.am \
+   lib/am/footer.am \
+   lib/am/header-vars.am \
+   lib/am/header.am \
+   lib/am/install.am \
+   lib/am/inst-vars.am \
+   lib/am/java.am \
+   lib/am/lang-compile.am \
+   lib/am/lex.am \
+   lib/am/library.am \
+   lib/am/libs.am \
+   lib/am/libtool.am \
+   lib/am/lisp.am \
+   lib/am/ltlib.am \
+   lib/am/ltlibrary.am \
+   lib/am/mans-vars.am \
+   lib/am/mans.am \
+   lib/am/program.am \
+   lib/am/progs.am \
+   lib/am/python.am \
+   lib/am/remake-hdr.am \
+   lib/am/scripts.am \
+   lib/am/subdirs.am \
+   lib/am/tags.am \
+   lib/am/texi-vers.am \
+   lib/am/texibuild.am \
+   lib/am/texinfos.am \
+   lib/am/vala.am \
+   lib/am/yacc.am
+ ## ------------------------------ ##
+ ##  Automake-provided m4 macros.  ##
+ ## ------------------------------ ##
+ dist_automake_ac_DATA = \
+   m4/amversion.m4 \
+   m4/ar-lib.m4 \
+   m4/as.m4 \
+   m4/auxdir.m4 \
+   m4/ccstdc.m4 \
+   m4/cond.m4 \
+   m4/cond-if.m4 \
+   m4/depend.m4 \
 -  m4/depout.m4 \
+   m4/dmalloc.m4 \
+   m4/gcj.m4 \
+   m4/header.m4 \
+   m4/init.m4 \
+   m4/install-sh.m4 \
+   m4/lead-dot.m4 \
+   m4/lex.m4 \
+   m4/lispdir.m4 \
+   m4/maintainer.m4 \
 -  m4/make.m4 \
+   m4/minuso.m4 \
+   m4/missing.m4 \
+   m4/mkdirp.m4 \
+   m4/obsol-gt.m4 \
+   m4/obsol-lt.m4 \
+   m4/obsolete.m4 \
+   m4/options.m4 \
+   m4/protos.m4 \
+   m4/python.m4 \
+   m4/runlog.m4 \
+   m4/sanity.m4 \
+   m4/silent.m4 \
+   m4/strip.m4 \
+   m4/substnot.m4 \
+   m4/tar.m4 \
+   m4/upc.m4 \
+   m4/vala.m4
+ dist_system_ac_DATA = m4/acdir/README
+ # We build amversion.m4 here, instead of from config.status,
+ # because config.status is rerun each time one of configure's
+ # dependencies change and amversion.m4 happens to be a configure
+ # dependency.  configure and amversion.m4 would be rebuilt in
+ # loop otherwise.
+ # Use '$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
+ # how amversion.m4 appears in our dependencies.
+ $(top_srcdir)/m4/amversion.m4: $(srcdir)/configure.ac $(srcdir)/m4/amversion.in
+       $(AM_V_at)rm -f $@-t $@
+       $(AM_V_GEN)in=amversion.in \
+         && $(do_subst) <$(srcdir)/m4/amversion.in >$@-t
+       $(generated_file_finalize)
+ EXTRA_DIST += m4/amversion.in
+ ## ------------ ##
+ ##  Testsuite.  ##
+ ## ------------ ##
+ # Run the tests with the shell detected at configure time.
+ LOG_COMPILER = $(SHELL)
+ TEST_EXTENSIONS = .pl .sh .tap
+ SH_LOG_COMPILER = $(LOG_COMPILER)
+ TAP_LOG_COMPILER = $(LOG_COMPILER)
+ PL_LOG_COMPILER = $(PERL)
+ AM_PL_LOG_FLAGS = -Mstrict -I $(builddir)/lib -I $(srcdir)/lib -w
+ TAP_LOG_DRIVER = AM_TAP_AWK='$(AWK)' $(SHELL) $(srcdir)/lib/tap-driver.sh
+ AM_TAP_LOG_DRIVER_FLAGS = --merge
+ EXTRA_DIST += t/ax/is
+ TESTS = ## Will be updated later.
+ # Some testsuite-influential variables should be overridable from the
+ # test scripts, but not from the environment.
+ AM_TESTS_ENVIRONMENT = \
+   for v in \
+     me \
+     required \
+     am_using_tap \
+     am_parallel_tests \
+     am_test_prefer_config_shell \
+     am_original_AUTOMAKE \
+     am_original_ACLOCAL \
+   ; do \
+     eval test x"\$${$$v}" = x || unset $$v; \
+   done;
+ # The 'AM_TESTS_REEXEC=no' setting tells the tests not to needlessly
+ # re-execute themselves with the shell detected at configure time, since
+ # we are already running them under it explicitly in our setup (see e.g.
+ # the definition of TEST_LOG_COMPILER above).
+ AM_TESTS_ENVIRONMENT += AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC;
+ # We want warning messages and explanations for skipped tests to go to
+ # the console if possible, so set up 'stderr_fileno_' properly.
+ AM_TESTS_FD_REDIRECT = 9>&2
+ AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_;
+ # Hand-written tests.
+ include $(srcdir)/t/list-of-tests.mk
+ TESTS += $(handwritten_TESTS)
+ EXTRA_DIST += $(handwritten_TESTS)
+ # Automatically-generated tests wrapping hand-written ones.
+ # Also, automatically-computed dependencies for tests.
+ include $(srcdir)/t/testsuite-part.am
+ TESTS += $(generated_TESTS)
+ EXTRA_DIST += $(generated_TESTS)
+ $(srcdir)/t/testsuite-part.am:
+       $(AM_V_at)rm -f t/testsuite-part.tmp $@
+       $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part \
+         --srcdir $(srcdir) > t/testsuite-part.tmp
+       $(AM_V_at)chmod a-w t/testsuite-part.tmp
+       $(AM_V_at)mv -f t/testsuite-part.tmp $@
+ EXTRA_DIST += gen-testsuite-part
+ $(generated_TESTS) $(srcdir)/t/testsuite-part.am: \
+   $(srcdir)/gen-testsuite-part \
+   t/list-of-tests.mk \
+   Makefile.am \
+   $(handwritten_TESTS)
+ # Static dependencies valid for each test case.
+ check_SCRIPTS = t/wrap/aclocal-$(APIVERSION) t/wrap/automake-$(APIVERSION)
+ dist_check_DATA = t/ax/plain-functions.sh t/ax/tap-functions.sh
+ check_DATA = defs defs-static
+ # Few more static dependencies.
+ t/distcheck-missing-m4.log: t/ax/distcheck-hook-m4.am
+ t/distcheck-outdated-m4.log: t/ax/distcheck-hook-m4.am
+ EXTRA_DIST += t/ax/distcheck-hook-m4.am
+ defs-static: defs-static.in Makefile
+       $(AM_V_at)rm -f $@ $@-t
+       $(AM_V_GEN)in=defs-static.in\
+         && $(do_subst) <$(srcdir)/defs-static.in >$@-t
+       $(generated_file_finalize)
+ EXTRA_DIST += defs-static.in
+ CLEANFILES += defs-static
+ # If two test scripts have the same basename, they will end up sharing
+ # the same log file, leading to all sort of undefined and undesired
+ # behaviours.
+ check-no-repeated-test-name:
+       @LC_ALL=C; export LC_ALL; \
+        lst='$(TEST_LOGS)'; for log in $$lst; do echo $$log; done \
+          | sort | uniq -c | awk '($$1 > 1) { print }' \
+          | sed 's/\.log$$//' | grep . >&2 \
+          && { \
+            echo $@: test names listed above are duplicated >&2; \
+            exit 1; \
+          }; :
+ check-local: check-no-repeated-test-name
+ .PHONY: check-no-repeated-test-name
+ ## Checking the list of tests.
+ test_subdirs = t t/pm
+ include $(srcdir)/t/CheckListOfTests.am
+ # Run the testsuite with the installed aclocal and automake.
+ installcheck-local: installcheck-testsuite
+ installcheck-testsuite:
 -      am_running_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
++      am_running_installcheck=yes $(MAKE) check
+ clean-local: clean-local-check
+ .PHONY: clean-local-check
+ clean-local-check:
+       -set x t/*.dir; shift; \
+        if test "$$#,$$1" = "1,*.dir"; then \
+          : there is no test directory to clean; \
+        else \
+          find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
+          rm -rf "$$@"; \
+        fi;
+ ## ---------------- ##
+ ##  Documentation.  ##
+ ## ---------------- ##
+ info_TEXINFOS = doc/automake.texi doc/automake-history.texi
+ doc_automake_TEXINFOS = doc/fdl.texi
+ doc_automake_history_TEXINFOS = doc/fdl.texi
+ dist_man1_MANS = \
+   $(srcdir)/doc/aclocal.1 \
+   $(srcdir)/doc/automake.1 \
+   $(srcdir)/doc/aclocal-$(APIVERSION).1 \
+   $(srcdir)/doc/automake-$(APIVERSION).1
+ $(dist_man1_MANS): $(srcdir)/configure.ac
+ MAINTAINERCLEANFILES += $(dist_man1_MANS)
+ update_mans = \
+   $(AM_V_GEN): \
 -    && $(MAKE) $(AM_MAKEFLAGS) lib/Automake/Config.pm \
++    && $(MAKE) lib/Automake/Config.pm \
+     && PATH="$(abs_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
+     && export PATH \
+     && $(HELP2MAN) --output=$@
+ $(srcdir)/doc/aclocal.1 $(srcdir)/doc/automake.1:
+       $(AM_V_GEN): \
+         && f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'` \
+         && echo ".so man1/$$f-$(APIVERSION).1" > $@
+ $(srcdir)/doc/aclocal-$(APIVERSION).1: $(srcdir)/aclocal.in
+       $(update_mans) aclocal-$(APIVERSION)
+ $(srcdir)/doc/automake-$(APIVERSION).1: $(srcdir)/automake.in
+       $(update_mans) automake-$(APIVERSION)
+ ## ---------------------------- ##
+ ##  Example package "amhello".  ##
+ ## ---------------------------- ##
+ amhello_sources = \
+   doc/amhello/configure.ac \
+   doc/amhello/Makefile.am \
+   doc/amhello/README \
+   doc/amhello/src/main.c \
+   doc/amhello/src/Makefile.am
+ amhello_configury = \
+   aclocal.m4 \
+   autom4te.cache \
+   Makefile.in \
+   config.h.in \
+   configure \
+   depcomp \
+   install-sh \
+   missing \
+   src/Makefile.in
+ dist_noinst_DATA = $(amhello_sources)
+ dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz
+ # We depend on configure.ac so that we regenerate the tarball
+ # whenever the Automake version changes.
+ # aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by
+ # configure in 't/wrap'.
+ $(srcdir)/doc/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
+       $(AM_V_GEN): \
+         && PATH="$(abs_top_builddir)/t/wrap$(PATH_SEPARATOR)$$PATH" \
+         && export PATH \
+         && $(am__cd) $(srcdir)/doc/amhello \
+         && ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL \
+         && AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE \
+         && AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF \
+         && AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE \
+         && AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF \
+         && AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER \
+         && AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE \
+         && $(am_AUTORECONF) -vfi \
+         && ./configure \
 -        && $(MAKE) $(AM_MAKEFLAGS) distcheck \
 -        && $(MAKE) $(AM_MAKEFLAGS) distclean \
++        && $(MAKE) distcheck \
++        && $(MAKE) distclean \
+         && rm -rf $(amhello_configury) \
+         && mv -f amhello-1.0.tar.gz ..
+ ## ------------------------------------------------- ##
+ ##  Third-party, obsolescent or experimental stuff.  ##
+ ## ------------------------------------------------- ##
+ EXTRA_DIST += \
+   contrib/check-html.am \
+   contrib/multilib/README \
+   contrib/multilib/config-ml.in \
+   contrib/multilib/symlink-tree \
+   contrib/multilib/multilib.am \
+   contrib/multilib/multi.m4 \
+   contrib/README
+ ## --------------------------------------------------- ##
+ ##  Older files, kept mostly for historical interest.  ##
+ ## --------------------------------------------------- ##
+ EXTRA_DIST += \
+   old/ChangeLog-tests \
+   old/ChangeLog.96 \
+   old/ChangeLog.98 \
+   old/ChangeLog.00 \
+   old/ChangeLog.01 \
+   old/ChangeLog.02 \
+   old/ChangeLog.03 \
+   old/ChangeLog.04 \
+   old/ChangeLog.09 \
+   old/ChangeLog.11 \
+   old/TODO
+ ##########################################################################
  ## Everything past here is useful to the maintainer, but probably not
- ## to anybody else
- ##
+ ## to anybody else.
+ ##########################################################################
+ ## --------------------------------------------------------- ##
+ ##  Automatic generation of the ChangeLog from git history.  ##
+ ## --------------------------------------------------------- ##
  
  gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
  gitlog_to_changelog_fixes = $(srcdir)/.git-log-fix
diff --cc README
index 55112834a12dc69abdc9e6ac9a72a90636eb62b9,d69fbd4f411112979bb7b8f6564434c02fef3ba6..4b78fe95056604cdd7b3e89ee832f2bec6165fbd
--- 1/README
--- 2/README
+++ b/README
@@@ -113,16 -18,30 +113,16 @@@ to generate an 'aclocal.m4' based on th
  It is useful as an extensible, maintainable mechanism for augmenting
  autoconf.  It is intended that other package authors will write m4
  macros which can be automatically used by aclocal.  The documentation
 -for aclocal is currently found in the Automake manual.
 +for aclocal is currently found in the Automake-NG manual.
  
 -Automake has a test suite.  Use "make check" to run it.  For more
 +Automake-NG has a test suite.  Use "make check" to run it.  For more
- information, see the file tests/README.
+ information, see the file t/README.
  
 -Automake has a page on the web.  See:
 -
 -      http://www.gnu.org/software/automake/
 -
 -Automake also has three mailing lists:
 -
 -  * automake@gnu.org
 -    For general discussions of Automake and its interactions with other
 -    configuration/portability tools like Autoconf or Libtool.
 -
 -  * bug-automake@gnu.org
 -    Where to send bug reports and feature requests.
 -
 -  * automake-patches@gnu.org
 -    Where to send patches, and discuss the automake development process
 -    and the  design of new features.
 -
 -To obtain more information about these list, or to subscribe to them,
 -refer to <http://www.gnu.org/software/automake/#mailinglists>
 +Automake-NG still doesn't have a page on the web.  But it has one
 +mailing list, <automake-ng@gnu.org>, that can be used for general
 +discussions and to send bug reports, feature requests, and patches.
 +To obtain more information about this list, or to subscribe to it,
 +refer to <http://lists.gnu.org/mailman/listinfo/automake-ng/>
  
  New releases are announced to autotools-announce@gnu.org.  If you want to
  be informed, subscribe to that list by following the instructions at
diff --cc configure.ac
Simple merge
diff --cc defs
Simple merge
index 76aa6516ec74180b98c555765196fbc28a140246,b30968451639aafb75259f039a3345d2a5e212bf..b49723304dd4982f6522f63fedaed617594c1e9b
@@@ -1865,12 -1873,11 +1865,12 @@@ names might change in future releases
  @cindex Automake, recursive operation
  @cindex Example of recursive operation
  
 -When examining a variable definition, Automake will recursively examine
 -variables referenced in the definition.  For example, if Automake is
 -looking at the content of @code{foo_SOURCES} in this snippet
 +When examining the definition of some ``special'' variables, Automake
 +might recursively examine variables referenced in the definition in order
 +to perform its magic.  For example, if Automake is looking at the content
 +of @code{foo_SOURCES} in this snippet
  
- @c Keep in sync with interp.test.
+ @c Keep in sync with interp.sh
  @example
  xs = a.c b.c
  foo_SOURCES = c.c $(xs)
@@@ -2724,8 -2716,10 +2724,8 @@@ variables
  The categories output by default are @samp{syntax} and
  @samp{unsupported}.  Additionally, @samp{gnu} and @samp{portability}
  are enabled in @option{--gnu} and @option{--gnits} strictness.
 -On the other hand, the @option{silent-rules} options (@pxref{Options})
 -turns off portability warnings about recursive variable expansions.
  
- @c Checked by extra-portability.test
+ @c Checked by extra-portability.sh
  Turning off @samp{portability} will also turn off @samp{extra-portability},
  and similarly turning on @samp{extra-portability} will also turn on
  @samp{portability}.  However, turning on @samp{portability} or turning
@@@ -9127,9 -9132,9 +9127,9 @@@ whose testsuite takes long time to exec
  easily be avoided by overriding also @code{TEST_SUITE_LOG} at runtime;
  for example,
  
- @c Keep in sync with parallel-tests-log-override-2.test.
+ @c Keep in sync with parallel-tests-log-override-2.sh
  @example
 -env TEST_SUITE_LOG=partial.log TESTS="..." make -e check
 +make check TEST_SUITE_LOG=partial.log TESTS="..."
  @end example
  
  will write the result of the partial testsuite runs to the
index a12082f9b708d1d48e8761f2a4403e700dfb8df1,a2db2d30bd205932cfae7cdf8a3983e03537329a..dbf8be3bb950916cf7bb5e92ef013309f91085d0
@@@ -152,13 -156,8 +156,13 @@@ my %deps_extractor 
      use_trivial_test_driver =>
        {
          line_matcher => qr/\btrivial-test-driver\b/,
-         dist_prereqs => "trivial-test-driver",
+         dist_prereqs => "t/$auxdir/trivial-test-driver",
        },
-         dist_prereqs => "depcomp-shuffle.sh",
 +    depcomp_shuffle =>
 +      {
 +        line_matcher => qr/\bdepcomp-shuffle\.sh\b/,
++        dist_prereqs => "t/$auxdir/depcomp-shuffle.sh",
 +      },
      check_testsuite_summary =>
        {
          line_matcher => qr/\btestsuite-summary-checks\.sh\b/,
index e97baf9d98a598f7e399a408afa2294b38354905,11b2225cfb7b29bbf7750bda631c719af25207e3..4297225f0ca96f41af7599a4741f0443cde41827
@@@ -288,111 -279,14 +287,109 @@@ sc_AMDEP_TRUE_in_automake_in
          exit 1; \
        fi
  
 -## Recursive make invocations should always pass $(AM_MAKEFLAGS)
 -## to $(MAKE), for portability to non-GNU make.
 -sc_tests_make_without_am_makeflags:
 -      @if grep '^[^#].*(MAKE) ' $(ams) $(srcdir)/automake.in \
 -          | grep -v 'AM_MAKEFLAGS' \
 -          | grep -v '/am/header-vars\.am:.*am--echo.*| $$(MAKE) -f *-'; \
 +## Tests should never require GNU make explicitly: automake-ng assumes
 +## it unconditionally.
 +sc_tests_no_gmake_requirement:
-       @if grep -iE '^ *required=.*\b(gmake|gnumake)\b' \
-         $(xtests) $(srcdir)/tests/defs $(srcdir)/tests/defs-static.in \
-       ; then \
++      @if grep -iE '^ *required=.*\b(g|gnu)make\b' $(xtests) $(xdefs); \
+       then \
 -        echo 'Use $$(MAKE) $$(AM_MAKEFLAGS).' 1>&2; \
 +        echo 'Tests should never require GNU make explicitly.' 1>&2; \
 +        exit 1; \
 +      fi
 +
 +## Tests should never check explicitly whether the make program being
 +## used in the test suite is indeed GNU make: automake-ng assumes it
 +## unconditionally.
 +sc_tests_no_gmake_checking:
-       @if grep -E '\b(is|using)_g(nu)?make\b' \
-         $(xtests) $(srcdir)/tests/defs $(srcdir)/tests/defs-static.in \
-       ; then \
++      @if grep -E '\b(is|using)_g(nu)?make\b' $(xtests) $(xdefs); \
++      then \
 +        echo 'Tests should never explicitly check whether $$MAKE' \
 +             'is GNU make.' 1>&2; \
 +        exit 1; \
 +      fi
 +
 +## GNU make can obviously chain suffix rules, so don't try to check
 +## whether this is the case.
 +sc_tests_make_can_chain_suffix_rules:
 +      @if grep 'chain_suffix_rule' $(xtests); then \
 +        echo 'GNU make can implicitly chain suffix rules; tests' \
 +             'should just assume that without checking.' 1>&2; \
 +        exit 1; \
 +      fi
 +
 +## Automake bug#7884 affects only FreeBSD make, so that we don't
 +## need to work around in any of our tests anymore.
 +sc_tests_make_dont_do_useless_vpath_rebuilds:
 +      @if grep -E 'useless_vpath_rebuild|yl_distcheck' $(xtests); then \
 +        echo 'No need to work around automake bug#7884 anymore;' \
 +             'it only affects FreeBSD make.' 1>&2; \
 +        exit 1; \
 +      fi
 +
 +## GNU make supports POSIX-style runtime include directives.
 +sc_grep_for_bad_make_include = \
 +  if grep -E 'AM_MAKE_INCLUDE|am__(include|quote)' $$files; then \
 +    echo 'GNU make supports runtime "include" directive.' 1>&2; \
 +    echo 'Neither am__{include,quote} nor AM_MAKE_INCLUDE' \
 +         'should be used anymore.' 1>&2; \
 +    exit 1; \
 +  fi
 +sc_tests_make_simple_include: sc_ensure_testsuite_has_run
 +      @files=tests/*.log; $(sc_grep_for_bad_make_include)
 +sc_make_simple_include:
 +      @files=" \
 +         $(xtests) \
 +         $(ams) \
 +         $(srcdir)/m4/*.m4 \
 +         $(srcdir)/automake.in \
 +         $(srcdir)/doc/*.texi \
 +         aclocal.m4 \
 +         configure \
 +       "; \
 +       $(sc_grep_for_bad_make_include)
 +
 +## The '.MAKE' special target is NetBSD-make specific, and not supported
 +## by GNU make.  No point in using it.
 +sc_no_dotmake_target:
 +      @files="\
 +        `find $(srcdir) -name '*.am'` \
 +        $(srcdir)/automake.in \
 +        $(srcdir)/doc/*.texi \
 +       "; \
 +      if grep '\.MAKE' $$files; then \
 +        echo "Special target '.MAKE' not supported by GNU make." 1>&2; \
 +        echo "Use the '+' recipe modifier instead, or put the" \
 +             "'\$$(MAKE)' string somewhere in the recipe text." 1>&2; \
 +        exit 1; \
 +      fi
 +
 +## $(AM_MAKEFLAGS) is obsolete now that we assume GNU make, since it
 +## is smart enough to correctly pass the values of macros redefined on
 +## the command line to sub-make invocations.
 +sc_no_am_makeflags:
 +      @files="\
 +        $(xtests) \
 +        $(ams) \
 +        $(srcdir)/automake.in \
 +        $(srcdir)/doc/*.texi \
 +       "; \
 +      if grep '\bAM_MAKEFLAGS\b' $$files; then \
 +        echo "\$$(AM_MAKEFLAGS) is obsolete, don't use it." 1>&2; \
 +        exit 1; \
 +      fi
 +
 +## "make -e" is brittle and unsafe, since it let *all* the environment
 +## win over the macro definitions in the Makefiles.  We needed it when
 +## we couldn't assume GNU make, but now that the tide has turned, it's
 +## better to prohibit it altogether.
 +sc_tests_no_make_e:
 +      @if grep -E '\$$MAKE\b.* -[a-zA-Z0-9]*e' $(xtests); then \
 +        echo "\"make -e\" is brittle, don't use it." 1>&2; \
 +        exit 1; \
 +      fi
 +sc_docs_no_make_e:
-       @if grep '\bmake\b.* -[a-zA-Z0-9]*e' README tests/README; then \
++      @if grep '\bmake\b.* -[a-zA-Z0-9]*e' README t/README; then \
 +        echo "Don't advocate the use of \"make -e\" in the manual or" \
 +             " in the README files." 1>&2; \
          exit 1; \
        fi
  
diff --cc t/README
index e0d98df7aa0568467b5b333584d7a0fc4aa866a8,75dae9e206db2bd719c03814c218dd3b86389bf5..f1cdc5ff6a0372d114ecaf06bda8200a0f1bd7c0
+++ b/t/README
@@@ -26,12 -31,13 +31,12 @@@ Running the test
  
    To run only selected tests:
  
-     make -k check TESTS="foo.test bar.test"
 -    make -k check TESTS="t/foo.sh t/bar.tap"           (GNU make)
 -    env TESTS="t/foo.sh t/bar.tap" make -e -k check    (non-GNU make)
++    make -k check TESTS="t/foo.sh t/bar.tap"
  
   To run the tests in cross-compilation mode, you should first configure
 - the automake source tree to a cross-compilation setup.  For example, to
 - run with a Linux-to-MinGW cross compiler, you will need something like
 - this:
 + the Automake-NG source tree to a cross-compilation setup.  For example,
 + to run with a Linux-to-MinGW cross compiler, you will need something
 + like this:
  
     ./configure --host i586-mingw32msvc --build i686-pc-linux-gnu
  
@@@ -61,30 -67,13 +66,14 @@@ Interpretatio
  About the tests
  ---------------
  
 -  There are two kinds of tests in the Automake testsuite (both implemented
 -  as shell scripts).  The scripts with the '.sh' suffix are "simple"
 -  tests, their outcome completely determined by their exit status.  Those
 -  with the '.tap' suffix use the TAP protocol.  If you want to run a test
 -  by hand, you can do so directly if it is a simple test:
 +  There are two kinds of tests in the Automake-NG testsuite (both
-   implemented as shell scripts).  The scripts with the '.test' suffix
-   are "simple" tests, their outcome completely determined by their exit
-   status.  Those with the '.tap' suffix use the TAP protocol.  If you
-   want to run a test by hand, you can do so directly if it is a simple
-   test:
++  implemented as shell scripts).  The scripts with the '.sh' suffix
++  are "simple" tests, their outcome completely determined by their
++  exit status.  Those with the '.tap' suffix use the TAP protocol.
++  If you want to run a test by hand, you can do so directly if it is
++  a simple test:
  
-     ./nogzip.test
+     ./t/nogzip.sh
  
    (it will be verbose by default), while if it is a TAP test you can pass
    it to your preferred TAP runner, as in e.g.:
    `echo $filename | ...`.
  
    Make sure your test script can be used to faithfully check an
 -  installed version of automake (as with "make installcheck").  For
 -  example, if you need to copy or grep an automake-provided script,
 +  installed version of Automake-ng (as with "make installcheck").  For
 +  example, if you need to copy or grep an Automake-ng provided script,
    do not assume that they can be found in the '$top_srcdir/lib'
    directory, but use '$am_scriptdir' instead.  The complete list of
-   such "$am_..dir" variables can be found in tests/defs-static.in.
+   such "$am_...dir" variables can be found in the 'defs-static.in'
+   file.
  
    When writing input for lex, include the following in the definitions
    section:
diff --cc t/aclocal4.sh
Simple merge
Simple merge
index 56eb7a3991e0582fc33eb960d7d43ebaa71bf084,0000000000000000000000000000000000000000..56eb7a3991e0582fc33eb960d7d43ebaa71bf084
mode 100755,000000..100644
--- /dev/null
index c5da03dc4a5e7fee0a7373ce74130574a4047b37,6965281bc0a2528e76470ef7be2523b5270e735b..2e2ac4c7db975298ecd89efc27c7e836adba4c5c
mode 100755,100644..100644
index f36f7a505efa0689701e8e2b16a03c03c31a0133,309d473454418b12079466beb21c5607f659ad33..5531729e4e31f32a59238c87f84778dffc87f5a5
mode 100755,100644..100644
diff --cc t/canon.sh
Simple merge
diff --cc t/canon5.sh
Simple merge
Simple merge
diff --cc t/check10.sh
Simple merge
diff --cc t/check11.sh
Simple merge
diff --cc t/check12.sh
Simple merge
diff --cc t/check4.sh
Simple merge
diff --cc t/check5.sh
Simple merge
diff --cc t/check7.sh
Simple merge
diff --cc t/check8.sh
Simple merge
diff --cc t/color.sh
Simple merge
Simple merge
diff --cc t/cscope.tap
Simple merge
index c8747cddc4742971913ac547f319a26b05a9c836,0000000000000000000000000000000000000000..c8747cddc4742971913ac547f319a26b05a9c836
mode 100755,000000..100755
--- /dev/null
index c97a1b6946e8efeeb88391957e609967de492b68,0b5bbcd9b3f976d798e2b1a8686190283f5adbb8..67f7c1928e7a53a368438cfe904fbfb5ac982c90
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -# Test that := definitions produce warnings, but otherwise work.
 +# Dependency tracking in the face of added/removed/renamed files.
 +#  - VPATH build
 +#  - use of subdir-objects
  
 -. ./defs || Exit 1
 -
 -cat > Makefile.am << 'END'
 -ICONS := $(wildcard *.xbm)
 -END
 -
 -$ACLOCAL
 -AUTOMAKE_fails
 -grep ':=.*not portable' stderr
 -
 -$AUTOMAKE -Wno-portability
 -grep '^ICONS *:= *\$(wildcard \*\.xbm) *$' Makefile.in
 -
 -:
 +. ./defs-static || exit '99'
 +xdir='sub' vpath='yes'
- . $testsrcdir/depcomp-shuffle.sh
++. "$am_testauxdir"/depcomp-shuffle.sh
index 9338508432a59183e95b5609c08920f7d14c4bc7,bdba44eded56bec50f6c84f5b3703d593542a60b..a2bbf2f823e40d4126ac2a72d37dbfa8c7f0d3c7
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -# Test to make sure that -Wportability understands %-style pattern
 -# rules.
 +# Dependency tracking in the face of added/removed/renamed files.
 +#  - in-tree build
 +#  - use of subdir-objects
  
 -. ./defs || Exit 1
 -
 -cat >>configure.ac <<EOF
 -AC_PROG_CC
 -EOF
 -
 -cat >Makefile.am <<EOF
 -bin_PROGRAMS = liver
 -liver_SOURCES = foo.c
 -
 -%.o: %.c
 -      echo "gnu make extension"
 -EOF
 -
 -$ACLOCAL
 -AUTOMAKE_fails -Wportability
 -grep 'Makefile.am:4:.*%' stderr
 +. ./defs-static || exit '99'
 +xdir='sub' vpath='no'
- . $testsrcdir/depcomp-shuffle.sh
++. "$am_testauxdir"/depcomp-shuffle.sh
index eca1004821c9ca6719cadc32406ec876f7dae528,728cc3299ce11863ebb691bee90abe5d4364eb6e..2686a5431aab87a4b499ec278e750ba530bd4b03
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -# Test that := definitions work as expected at make time.
 +# Dependency tracking in the face of added/removed/renamed files.
 +#  - VPATH build
 +#  - no use of subdir-objects
  
 -required=GNUmake
 -. ./defs || Exit 1
 -
 -cat >> configure.ac << 'END'
 -AC_OUTPUT
 -END
 -
 -cat > Makefile.am << 'END'
 -BAR := $(FOO)
 -BAZ = $(FOO)
 -FOO := foo
 -.PHONY: test
 -test:
 -      test x'$(FOO)' = x'foo'
 -      test x'$(BAZ)' = x'foo'
 -      test x'$(BAR)' = x
 -END
 -
 -$ACLOCAL
 -$AUTOCONF
 -$AUTOMAKE -Wno-portability
 -
 -./configure
 -$MAKE test
 -
 -:
 +. ./defs-static || exit '99'
 +xdir='' vpath='yes'
- . $testsrcdir/depcomp-shuffle.sh
++. "$am_testauxdir"/depcomp-shuffle.sh
index ebd4017b7c9a6d406ae9789285283ded4a9a6cfc,a2c47a14fd4d8438a43f7ebf126665c110d807fc..e8126081b55ae6a335d31ebf6de6cabe897b4693
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
 -# Naming a subdirectory 'obj/' is a bad idea.  Automake should say so.
 +# Dependency tracking in the face of added/removed/renamed files.
 +#  - in-tree build
 +#  - no use of subdir-objects
  
 -. ./defs || Exit 1
 -
 -mkdir obj
 -
 -cat >>configure.ac << 'END'
 -AC_CONFIG_FILES([obj/Makefile])
 -AC_OUTPUT
 -END
 -
 -: > obj/Makefile.am
 -echo 'SUBDIRS = obj' >Makefile.am
 -
 -$ACLOCAL
 -
 -AUTOMAKE_fails
 -grep 'Makefile.am:1:.*obj.*BSD' stderr
 -
 -cat >Makefile.am <<'END'
 -SUBDIRS = @STH@
 -FOO = obj
 -DIST_SUBDIRS = $(FOO)
 -END
 -
 -AUTOMAKE_fails
 -grep 'Makefile.am:2:.*obj.*BSD' stderr
 -
 -:
 +. ./defs-static || exit '99'
 +xdir='' vpath='no'
- . $testsrcdir/depcomp-shuffle.sh
++. "$am_testauxdir"/depcomp-shuffle.sh
diff --cc t/depend.sh
Simple merge
diff --cc t/depend4.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/distdir.sh
Simple merge
Simple merge
diff --cc t/dollar.sh
Simple merge
diff --cc t/exeext.sh
Simple merge
diff --cc t/exsource.sh
Simple merge
diff --cc t/extra10.sh
Simple merge
diff --cc t/extra11.sh
Simple merge
diff --cc t/extra12.sh
Simple merge
diff --cc t/fort2.sh
Simple merge
diff --cc t/gmake-vars.sh
index 0c4012b7df1b016c0d5b6dd3a0ea3a8a678c9ef3,0000000000000000000000000000000000000000..0c4012b7df1b016c0d5b6dd3a0ea3a8a678c9ef3
mode 100755,000000..100755
--- /dev/null
diff --cc t/gnits2.sh
Simple merge
diff --cc t/gnits3.sh
Simple merge
diff --cc t/gnumake.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/instdir.sh
Simple merge
diff --cc t/instdir2.sh
Simple merge
diff --cc t/insthook.sh
Simple merge
Simple merge
Simple merge
diff --cc t/instmany.sh
Simple merge
diff --cc t/instspc.tap
Simple merge
diff --cc t/interp3.sh
index 1394c6d181aa52c74b7f5291c18e05a9c855a3b2,0000000000000000000000000000000000000000..1394c6d181aa52c74b7f5291c18e05a9c855a3b2
mode 100755,000000..100755
--- /dev/null
Simple merge
Simple merge
diff --cc t/javaflags.sh
Simple merge
Simple merge
diff --cc t/lex-depend.sh
Simple merge
Simple merge
diff --cc t/lex-libobj.sh
Simple merge
Simple merge
diff --cc t/lex3.sh
Simple merge
diff --cc t/lex5.sh
Simple merge
diff --cc t/lflags.sh
Simple merge
diff --cc t/lflags2.sh
Simple merge
diff --cc t/libobj19.sh
Simple merge
diff --cc t/libtool9.sh
Simple merge
diff --cc t/link_cond.sh
Simple merge
diff --cc t/lisp8.sh
Simple merge
index 0000000000000000000000000000000000000000,b2379a3163456f5279a8b5aa98b589a01ad3efa1..365d918df40f042766704ae58209deb5b2b6a6eb
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,1274 +1,1267 @@@
 -t/lex-subobj-nodep.sh \
+ ## Makefile fragment that holds the list of test scripts of the automake
+ ## testsuite.  This fragment is meant to be included by the Makefile.am,
+ ## but also to be executed directly by make when bootstrapping automake.
+ ## Copyright (C) 2011-2012 Free Software Foundation, Inc.
+ ##
+ ## This program is free software; you can redistribute it and/or modify
+ ## it under the terms of the GNU General Public License as published by
+ ## the Free Software Foundation; either version 2, or (at your option)
+ ## any later version.
+ ##
+ ## This program is distributed in the hope that it will be useful,
+ ## but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ## GNU General Public License for more details.
+ ##
+ ## You should have received a copy of the GNU General Public License
+ ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ # FIXME: this "expected failures" are in truth an hack used to
+ # FIXME: to verify that some incorrect usages of our perl libraries
+ # FIXME: raise an error.  We should find a cleaner way to check that.
+ perl_fake_XFAIL_TESTS = \
+ t/pm/Cond2.pl \
+ t/pm/Cond3.pl \
+ t/pm/DisjCon2.pl \
+ t/pm/DisjCon3.pl \
+ t/pm/Version2.pl \
+ t/pm/Version3.pl
+ XFAIL_TESTS = \
+ t/all.sh \
+ t/yacc-bison-skeleton-cxx.sh \
+ t/yacc-bison-skeleton.sh \
+ t/cond17.sh \
+ t/gcj6.sh \
+ t/override-conditional-2.sh \
+ t/dist-pr109765.sh \
+ t/instdir-cond2.sh \
++t/interp3.sh \
+ t/java-nobase.sh \
+ t/objext-pr10128.sh \
+ t/parallel-tests-many.sh \
+ t/pr8365-remake-timing.sh \
 -t/colneq.sh \
+ t/remake-am-pr10111.sh \
+ t/remake-m4-pr10111.sh \
+ t/txinfo5.sh \
+ $(perl_fake_XFAIL_TESTS)
+ perl_TESTS = \
+ t/pm/Cond2.pl \
+ t/pm/Cond3.pl \
+ t/pm/Condition.pl \
+ t/pm/Condition-t.pl \
+ t/pm/DisjCon2.pl \
+ t/pm/DisjCon3.pl \
+ t/pm/DisjConditions.pl \
+ t/pm/DisjConditions-t.pl \
+ t/pm/Version.pl \
+ t/pm/Version2.pl \
+ t/pm/Version3.pl \
+ t/pm/Wrap.pl
+ # The order here is mostly alphabetical, with the deliberate exception
+ # that tests having a high runtime (especially TAP tests that run various
+ # checks sequentially) are listed early; this improves performance on
+ # concurrent testsuite runs.
+ handwritten_TESTS = \
+ t/get-sysconf.sh \
+ $(perl_TESTS) \
+ t/instspc.tap \
+ t/aclocal.sh \
+ t/aclocal3.sh \
+ t/aclocal4.sh \
+ t/aclocal5.sh \
+ t/aclocal6.sh \
+ t/aclocal7.sh \
+ t/aclocal8.sh \
+ t/aclocal9.sh \
+ t/acloca10.sh \
+ t/acloca11.sh \
+ t/acloca12.sh \
+ t/acloca13.sh \
+ t/acloca14.sh \
+ t/acloca15.sh \
+ t/acloca16.sh \
+ t/acloca17.sh \
+ t/acloca18.sh \
+ t/acloca19.sh \
+ t/acloca20.sh \
+ t/acloca21.sh \
+ t/acloca22.sh \
+ t/acloca23.sh \
+ t/aclocal-acdir.sh \
+ t/aclocal-install-absdir.sh \
+ t/aclocal-print-acdir.sh \
+ t/aclocal-path.sh \
+ t/aclocal-path-install.sh \
+ t/aclocal-path-install-serial.sh \
+ t/aclocal-path-nonexistent.sh \
+ t/aclocal-path-precedence.sh \
+ t/aclocal-install-fail.sh \
+ t/aclocal-install-mkdir.sh \
+ t/aclocal-no-install-no-mkdir.sh \
+ t/aclocal-verbose-install.sh \
+ t/ac-output-old.tap \
+ t/acsilent.sh \
+ t/acsubst.sh \
+ t/acsubst2.sh \
+ t/add-missing.tap \
+ t/all.sh \
+ t/all2.sh \
+ t/alloca.sh \
+ t/alloca2.sh \
+ t/alpha.sh \
+ t/alpha2.sh \
+ t/amhello-cflags.sh \
+ t/amhello-cross-compile.sh \
+ t/amhello-binpkg.sh \
+ t/amassign.sh \
+ t/ammissing.sh \
+ t/amopt.sh \
+ t/amopts-location.sh \
+ t/amopts-variable-expansion.sh \
+ t/amsubst.sh \
+ t/ansi2knr-no-more.sh \
+ t/ar-lib.sh \
+ t/ar-lib2.sh \
+ t/ar-lib3.sh \
+ t/ar-lib4.sh \
+ t/ar-lib5a.sh \
+ t/ar-lib5b.sh \
+ t/ar-lib6a.sh \
+ t/ar-lib6b.sh \
+ t/ar-lib7.sh \
+ t/ar.sh \
+ t/ar2.sh \
+ t/ar3.sh \
+ t/ar4.sh \
+ t/ar5.sh \
+ t/asm.sh \
+ t/asm2.sh \
+ t/asm3.sh \
+ t/autodist.sh \
+ t/autodist-subdir.sh \
+ t/autodist-acconfig.sh \
+ t/autodist-acconfig-no-subdir.sh \
+ t/autodist-aclocal-m4.sh \
+ t/autodist-config-headers.sh \
+ t/autodist-configure-no-subdir.sh \
+ t/autodist-no-duplicate.sh \
+ t/autodist-stamp-vti.sh \
+ t/autohdr.sh \
+ t/autohdr2.sh \
+ t/autohdr3.sh \
+ t/autohdr4.sh \
+ t/autohdrdry.sh \
+ t/automake-cmdline.tap \
+ t/auxdir.sh \
+ t/auxdir6.sh \
+ t/auxdir7.sh \
+ t/auxdir8.sh \
+ t/auxdir-autodetect.sh \
+ t/auxdir-computed.tap \
+ t/auxdir-misplaced.sh \
+ t/auxdir-nonexistent.sh \
+ t/auxdir-unportable.tap \
+ t/backcompat.sh \
+ t/backcompat2.sh \
+ t/backcompat3.sh \
+ t/backcompat4.sh \
+ t/backcompat5.sh \
+ t/backcompat6.sh \
+ t/backsl.sh \
+ t/backsl2.sh \
+ t/backsl3.sh \
+ t/backsl4.sh \
+ t/badline.sh \
+ t/badopt.sh \
+ t/badprog.sh \
+ t/block.sh \
+ t/bsource.sh \
+ t/candist.sh \
+ t/canon.sh \
+ t/canon2.sh \
+ t/canon3.sh \
+ t/canon4.sh \
+ t/canon5.sh \
+ t/canon6.sh \
+ t/canon7.sh \
+ t/canon8.sh \
+ t/canon-name.sh \
+ t/ccnoco.sh \
+ t/ccnoco2.sh \
+ t/ccnoco3.sh \
+ t/check.sh \
+ t/check2.sh \
+ t/check3.sh \
+ t/check4.sh \
+ t/check5.sh \
+ t/check6.sh \
+ t/check7.sh \
+ t/check8.sh \
+ t/check10.sh \
+ t/check11.sh \
+ t/check12.sh \
+ t/check-subst.sh \
+ t/check-subst-prog.sh \
+ t/check-exported-srcdir.sh \
+ t/check-fd-redirect.sh \
+ t/check-tests-in-builddir.sh \
+ t/check-no-test-driver.sh \
+ t/check-concurrency-bug9245.sh \
+ t/checkall.sh \
+ t/clean.sh \
+ t/clean2.sh \
 -t/colneq3.sh \
+ t/colneq2.sh \
 -t/depend5.sh \
 -t/depend6.sh \
+ t/colon.sh \
+ t/colon2.sh \
+ t/colon3.sh \
+ t/colon4.sh \
+ t/colon5.sh \
+ t/colon6.sh \
+ t/colon7.sh \
+ t/color.sh \
+ t/color2.sh \
+ t/comment.sh \
+ t/comment2.sh \
+ t/comment3.sh \
+ t/comment4.sh \
+ t/comment5.sh \
+ t/comment6.sh \
+ t/comment7.sh \
+ t/comment8.sh \
+ t/comment9.sh \
+ t/commen10.sh \
+ t/commen11.sh \
+ t/comments-in-var-def.sh \
+ t/compile.sh \
+ t/compile2.sh \
+ t/compile3.sh \
+ t/compile4.sh \
+ t/compile5.sh \
+ t/compile6.sh \
+ t/compile_f90_c_cxx.sh \
+ t/compile_f_c_cxx.sh \
+ t/cond-basic.sh \
+ t/cond.sh \
+ t/cond2.sh \
+ t/cond3.sh \
+ t/cond4.sh \
+ t/cond5.sh \
+ t/cond6.sh \
+ t/cond7.sh \
+ t/cond8.sh \
+ t/cond9.sh \
+ t/cond10.sh \
+ t/cond11.sh \
+ t/cond13.sh \
+ t/cond14.sh \
+ t/cond15.sh \
+ t/cond16.sh \
+ t/cond17.sh \
+ t/cond18.sh \
+ t/cond19.sh \
+ t/cond20.sh \
+ t/cond21.sh \
+ t/cond22.sh \
+ t/cond23.sh \
+ t/cond24.sh \
+ t/cond25.sh \
+ t/cond26.sh \
+ t/cond27.sh \
+ t/cond28.sh \
+ t/cond29.sh \
+ t/cond30.sh \
+ t/cond31.sh \
+ t/cond32.sh \
+ t/cond33.sh \
+ t/cond34.sh \
+ t/cond35.sh \
+ t/cond36.sh \
+ t/cond37.sh \
+ t/cond38.sh \
+ t/cond39.sh \
+ t/cond40.sh \
+ t/cond41.sh \
+ t/cond42.sh \
+ t/cond43.sh \
+ t/cond44.sh \
+ t/cond45.sh \
+ t/cond46.sh \
+ t/condd.sh \
+ t/condhook.sh \
+ t/condhook2.sh \
+ t/condinc.sh \
+ t/condinc2.sh \
+ t/condlib.sh \
+ t/condman2.sh \
+ t/condman3.sh \
+ t/configure.sh \
+ t/confdeps.sh \
+ t/conff.sh \
+ t/conff2.sh \
+ t/conffile-leading-dot.sh \
+ t/confh.sh \
+ t/confh4.sh \
+ t/confh5.sh \
+ t/confh6.sh \
+ t/confh7.sh \
+ t/confh8.sh \
+ t/confincl.sh \
+ t/conflnk.sh \
+ t/conflnk2.sh \
+ t/conflnk3.sh \
+ t/conflnk4.sh \
+ t/confsub.sh \
+ t/confvar.sh \
+ t/confvar2.sh \
+ t/copy.sh \
+ t/cscope.tap \
+ t/cscope2.sh \
+ t/cscope3.sh \
+ t/cxx.sh \
+ t/cxx2.sh \
+ t/cxxcpp.sh \
+ t/cxxlibobj.sh \
+ t/cxxlink.sh \
+ t/cxxnoc.sh \
+ t/cxxo.sh \
+ t/cygnus-check-without-all.sh \
+ t/cygnus-dependency-tracking.sh \
+ t/cygnus-imply-foreign.sh \
+ t/cygnus-no-dist.sh \
+ t/cygnus-no-installinfo.sh \
+ t/cygnus-requires-maintainer-mode.sh \
+ t/cygwin32.sh \
+ t/dash.sh \
+ t/defun.sh \
+ t/defun2.sh \
+ t/dejagnu.sh \
+ t/dejagnu2.sh \
+ t/dejagnu3.sh \
+ t/dejagnu4.sh \
+ t/dejagnu5.sh \
+ t/dejagnu6.sh \
+ t/dejagnu7.sh \
+ t/dejagnu-absolute-builddir.sh \
+ t/dejagnu-relative-srcdir.sh \
+ t/dejagnu-siteexp-extend.sh \
+ t/dejagnu-siteexp-append.sh \
+ t/dejagnu-siteexp-useredit.sh \
+ t/deleted-am.sh \
+ t/deleted-m4.sh \
+ t/depacl2.sh \
+ t/depcomp.sh \
+ t/depcomp2.sh \
+ t/depcomp8a.sh \
+ t/depcomp8b.sh \
++t/depcomp-recover.sh \
++t/depcomp-shuffle-sub-vpath.sh \
++t/depcomp-shuffle-sub.sh \
++t/depcomp-shuffle-vpath.sh \
++t/depcomp-shuffle.sh \
+ t/depdist.sh \
+ t/depend.sh \
+ t/depend3.sh \
+ t/depend4.sh \
 -t/doc-parsing-buglets-colneq-subst.sh \
+ t/deprecated-acinit.sh \
+ t/destdir.sh \
+ t/dirlist.sh \
+ t/dirlist2.sh \
+ t/dirlist-abspath.sh \
+ t/discover.sh \
+ t/dist-formats.tap \
+ t/dist-auxdir-many-subdirs.sh \
+ t/dist-auxfile-2.sh \
+ t/dist-auxfile.sh \
+ t/dist-included-parent-dir.sh \
+ t/dist-missing-am.sh \
+ t/dist-missing-included-m4.sh \
+ t/dist-missing-m4.sh \
+ t/dist-readonly.sh \
+ t/dist-repeated.sh \
+ t/dist-pr109765.sh \
+ t/distcleancheck.sh \
+ t/distcom2.sh \
+ t/distcom3.sh \
+ t/distcom4.sh \
+ t/distcom5.sh \
+ t/distcom-subdir.sh \
+ t/distdir.sh \
+ t/disthook.sh \
+ t/distlinks.sh \
+ t/distlinksbrk.sh \
+ t/distname.sh \
+ t/distcheck-configure-flags.sh \
+ t/distcheck-configure-flags-am.sh \
+ t/distcheck-configure-flags-subpkg.sh \
+ t/distcheck-hook.sh \
+ t/distcheck-hook2.sh \
+ t/distcheck-writable-srcdir.sh \
+ t/distcheck-missing-m4.sh \
+ t/distcheck-outdated-m4.sh \
+ t/distcheck-override-infodir.sh \
+ t/distcheck-pr9579.sh \
+ t/distcheck-pr10470.sh \
+ t/dmalloc.sh \
 -t/dollarvar.sh \
 -t/dollarvar2.sh \
+ t/doc-parsing-buglets-tabs.sh \
+ t/dollar.sh \
 -t/extra-portability3.sh \
+ t/double.sh \
+ t/dup2.sh \
+ t/else.sh \
+ t/empty.sh \
+ t/empty2.sh \
+ t/empty3.sh \
+ t/empty4.sh \
+ t/exdir.sh \
+ t/exdir2.sh \
+ t/exdir3.sh \
+ t/exeext.sh \
+ t/exeext2.sh \
+ t/exeext3.sh \
+ t/exeext4.sh \
+ t/exsource.sh \
+ t/ext.sh \
+ t/ext2.sh \
+ t/ext3.sh \
+ t/extra.sh \
+ t/extra2.sh \
+ t/extra3.sh \
+ t/extra4.sh \
+ t/extra5.sh \
+ t/extra6.sh \
+ t/extra7.sh \
+ t/extra8.sh \
+ t/extra9.sh \
+ t/extra10.sh \
+ t/extra11.sh \
+ t/extra12.sh \
+ t/extra-programs-empty.sh \
+ t/extra-portability.sh \
+ t/extra-portability2.sh \
 -t/make.sh \
+ t/extradep.sh \
+ t/extradep2.sh \
+ t/f90only.sh \
+ t/flavor.sh \
+ t/flibs.sh \
+ t/fn99.sh \
+ t/fn99subdir.sh \
+ t/fnoc.sh \
+ t/fo.sh \
+ t/forcemiss.sh \
+ t/forcemiss2.sh \
+ t/fort1.sh \
+ t/fort2.sh \
+ t/fort4.sh \
+ t/fort5.sh \
+ t/fonly.sh \
+ t/fortdep.sh \
+ t/gcj.sh \
+ t/gcj2.sh \
+ t/gcj3.sh \
+ t/gcj4.sh \
+ t/gcj5.sh \
+ t/gcj6.sh \
+ t/gettext.sh \
+ t/gettext2.sh \
+ t/gettext3.sh \
++t/gmake-vars.sh \
+ t/gnumake.sh \
+ t/gnuwarn.sh \
+ t/gnuwarn2.sh \
+ t/gnits.sh \
+ t/gnits2.sh \
+ t/gnits3.sh \
+ t/hdr-vars-defined-once.sh \
+ t/header.sh \
+ t/help.sh \
+ t/help2.sh \
+ t/help3.sh \
+ t/help4.sh \
+ t/help-depend.sh \
+ t/help-depend2.sh \
+ t/help-dmalloc.sh \
+ t/help-init.sh \
+ t/help-lispdir.sh \
+ t/help-multilib.sh \
+ t/help-python.sh \
+ t/help-silent.sh \
+ t/help-upc.sh \
+ t/hfs.sh \
+ t/implicit.sh \
+ t/info.sh \
+ t/init.sh \
+ t/init2.sh \
+ t/insh2.sh \
+ t/install2.sh \
+ t/installdir.sh \
+ t/instsh.sh \
+ t/instsh2.sh \
+ t/instsh3.sh \
+ t/instdat.sh \
+ t/instdat2.sh \
+ t/instdir.sh \
+ t/instdir2.sh \
+ t/instdir-cond.sh \
+ t/instdir-cond2.sh \
+ t/instdir-no-empty.sh \
+ t/instdir-java.sh \
+ t/instdir-lisp.sh \
+ t/instdir-ltlib.sh \
+ t/instdir-prog.sh \
+ t/instdir-python.sh \
+ t/instdir-texi.sh \
+ t/instexec.sh \
+ t/instfail.sh \
+ t/instfail-info.sh \
+ t/instfail-java.sh \
+ t/instfail-libtool.sh \
+ t/insthook.sh \
+ t/instman.sh \
+ t/instman2.sh \
+ t/instmany.sh \
+ t/instmany-mans.sh \
+ t/instmany-python.sh \
+ t/install-info-dir.sh \
+ t/interp.sh \
+ t/interp2.sh \
++t/interp3.sh \
+ t/java.sh \
+ t/java2.sh \
+ t/java3.sh \
+ t/javadir-undefined.sh \
+ t/javaflags.sh \
+ t/java-check.sh \
+ t/java-clean.sh \
+ t/java-compile-install.sh \
+ t/java-compile-run-flat.sh \
+ t/java-compile-run-nested.sh \
+ t/java-empty-classpath.sh \
+ t/javaprim.sh \
+ t/javasubst.sh \
+ t/java-extra.sh \
+ t/java-mix.sh \
+ t/java-no-duplicate.sh \
+ t/java-nobase.sh \
+ t/java-noinst.sh \
+ t/java-rebuild.sh \
+ t/java-sources.sh \
+ t/java-uninstall.sh \
+ t/ldadd.sh \
+ t/ldflags.sh \
+ t/lex.sh \
+ t/lex2.sh \
+ t/lex3.sh \
+ t/lex5.sh \
+ t/lexcpp.sh \
+ t/lexvpath.sh \
+ t/lex-subobj-nodep.sh \
+ t/lex-lib.sh \
+ t/lex-lib-external.sh \
+ t/lex-libobj.sh \
+ t/lex-noyywrap.sh \
+ t/lex-clean-cxx.sh \
+ t/lex-clean.sh \
+ t/lex-depend-cxx.sh \
+ t/lex-depend-grep.sh \
+ t/lex-depend.sh \
+ t/lex-line.sh \
+ t/lex-nodist.sh \
+ t/lex-pr204.sh \
+ t/lflags.sh \
+ t/lflags2.sh \
+ t/libexec.sh \
+ t/libobj-basic.sh \
+ t/libobj2.sh \
+ t/libobj3.sh \
+ t/libobj4.sh \
+ t/libobj5.sh \
+ t/libobj7.sh \
+ t/libobj10.sh \
+ t/libobj12.sh \
+ t/libobj13.sh \
+ t/libobj14.sh \
+ t/libobj15a.sh \
+ t/libobj15b.sh \
+ t/libobj15c.sh \
+ t/libobj16a.sh \
+ t/libobj16b.sh \
+ t/libobj17.sh \
+ t/libobj18.sh \
+ t/libobj19.sh \
+ t/libobj20a.sh \
+ t/libobj20b.sh \
+ t/libobj20c.sh \
+ t/library.sh \
+ t/library2.sh \
+ t/library3.sh \
+ t/libtool.sh \
+ t/libtool2.sh \
+ t/libtool3.sh \
+ t/libtool4.sh \
+ t/libtool5.sh \
+ t/libtool6.sh \
+ t/libtool7.sh \
+ t/libtool8.sh \
+ t/libtool9.sh \
+ t/libtoo10.sh \
+ t/libtoo11.sh \
+ t/license.sh \
+ t/license2.sh \
+ t/link_c_cxx.sh \
+ t/link_cond.sh \
+ t/link_dist.sh \
+ t/link_f90_only.sh \
+ t/link_fc.sh \
+ t/link_fccxx.sh \
+ t/link_fcxx.sh \
+ t/link_f_only.sh \
+ t/link_override.sh \
+ t/lisp2.sh \
+ t/lisp3.sh \
+ t/lisp4.sh \
+ t/lisp5.sh \
+ t/lisp6.sh \
+ t/lisp7.sh \
+ t/lisp8.sh \
+ t/lispdry.sh \
+ t/listval.sh \
+ t/location.sh \
+ t/longline.sh \
+ t/longlin2.sh \
+ t/ltcond.sh \
+ t/ltcond2.sh \
+ t/ltconv.sh \
+ t/ltdeps.sh \
+ t/ltinit.sh \
+ t/ltinstloc.sh \
+ t/ltlibobjs.sh \
+ t/ltlibsrc.sh \
+ t/ltorder.sh \
+ t/lzma.sh \
+ t/m4-inclusion.sh \
+ t/maintclean.sh \
+ t/maintclean-vpath.sh \
+ t/maintmode-configure-msg.sh \
 -t/percent.sh \
 -t/percent2.sh \
+ t/makefile-deps.sh \
+ t/makej.sh \
+ t/makej2.sh \
+ t/maken.sh \
+ t/maken3.sh \
+ t/make-dryrun.tap \
+ t/makevars.sh \
+ t/man.sh \
+ t/man2.sh \
+ t/man3.sh \
+ t/man4.sh \
+ t/man5.sh \
+ t/man6.sh \
+ t/man7.sh \
+ t/man8.sh \
+ t/mdate.sh \
+ t/mdate2.sh \
+ t/mdate3.sh \
+ t/mdate4.sh \
+ t/mdate5.sh \
+ t/mdate6.sh \
+ t/missing.sh \
+ t/missing2.sh \
+ t/missing3.sh \
+ t/missing4.sh \
+ t/missing5.sh \
+ t/missing6.sh \
+ t/missing-auxfile-stops-makefiles-creation.sh \
+ t/mkinstall.sh \
+ t/mkinst2.sh \
+ t/mkinst3.sh \
+ t/mmode.sh \
+ t/mmodely.sh \
+ t/multlib.sh \
+ t/no-extra-makefile-code.sh \
+ t/no-outdir-option.sh \
+ t/nobase.sh \
+ t/nobase-libtool.sh \
+ t/nobase-python.sh \
+ t/nobase-nodist.sh \
+ t/nodef.sh \
+ t/nodef2.sh \
+ t/nodep.sh \
+ t/nodep2.sh \
+ t/nodepcomp.sh \
+ t/nodist.sh \
+ t/nodist2.sh \
+ t/nodist3.sh \
+ t/noinst.sh \
+ t/noinstdir.sh \
+ t/nolink.sh \
+ t/nostdinc.sh \
+ t/notrans.sh \
+ t/number.sh \
+ t/objc.sh \
+ t/objc2.sh \
++t/objdir.sh \
+ t/objext-pr10128.sh \
+ t/obsolete.sh \
+ t/oldvars.sh \
+ t/order.sh \
+ t/output.sh \
+ t/output2.sh \
+ t/output3.sh \
+ t/output4.sh \
+ t/output5.sh \
+ t/output6.sh \
+ t/output7.sh \
+ t/output8.sh \
+ t/output9.sh \
+ t/output10.sh \
+ t/output11.sh \
+ t/output12.sh \
+ t/output13.sh \
+ t/output-order.sh \
+ t/override-conditional-1.sh \
+ t/override-conditional-2.sh \
+ t/override-html.sh \
+ t/override-suggest-local.sh \
+ t/parallel-am.sh \
+ t/parallel-am2.sh \
+ t/parallel-am3.sh \
+ t/serial-tests.sh \
+ t/parallel-tests.sh \
+ t/parallel-tests2.sh \
+ t/parallel-tests3.sh \
+ t/parallel-tests5.sh \
+ t/parallel-tests6.sh \
+ t/parallel-tests8.sh \
+ t/parallel-tests9.sh \
+ t/parallel-tests10.sh \
+ t/parallel-tests-exeext.sh \
+ t/parallel-tests-suffix.sh \
+ t/parallel-tests-suffix-prog.sh \
+ t/parallel-tests-log-compiler-1.sh \
+ t/parallel-tests-log-compiler-2.sh \
+ t/parallel-tests-dry-run-1.sh \
+ t/parallel-tests-dry-run-2.sh \
+ t/parallel-tests-fd-redirect.sh \
+ t/parallel-tests-fd-redirect-exeext.sh \
+ t/parallel-tests-extra-programs.sh \
+ t/parallel-tests-unreadable.sh \
+ t/parallel-tests-subdir.sh \
+ t/parallel-tests-interrupt.tap \
+ t/parallel-tests-reset-term.sh \
+ t/parallel-tests-harderror.sh \
+ t/parallel-tests-log-override-1.sh \
+ t/parallel-tests-log-override-2.sh \
+ t/parallel-tests-log-override-recheck.sh \
+ t/parallel-tests-log-compiler-example.sh \
+ t/parallel-tests-cmdline-override.sh \
+ t/parallel-tests-fork-bomb.sh \
+ t/parallel-tests-empty-testlogs.sh \
+ t/parallel-tests-driver-install.sh \
+ t/parallel-tests-no-color-in-log.sh \
+ t/parallel-tests-no-spurious-summary.sh \
+ t/parallel-tests-exit-statuses.sh \
+ t/parallel-tests-console-output.sh \
+ t/parallel-tests-once.sh \
+ t/parallel-tests-trailing-bslash.sh \
+ t/parallel-tests-many.sh \
+ t/tests-environment.sh \
+ t/am-tests-environment.sh \
+ t/tests-environment-backcompat.sh \
+ t/testsuite-summary-color.sh \
+ t/testsuite-summary-count.sh \
+ t/testsuite-summary-count-many.sh \
+ t/testsuite-summary-reference-log.sh \
+ t/test-driver-acsubst.sh \
+ t/test-driver-cond.sh \
+ t/test-driver-custom-no-extra-driver.sh \
+ t/test-driver-custom.sh \
+ t/test-driver-custom-xfail-tests.sh \
+ t/test-driver-custom-multitest.sh \
+ t/test-driver-custom-multitest-recheck.sh \
+ t/test-driver-custom-multitest-recheck2.sh \
+ t/test-driver-create-log-dir.sh \
+ t/test-driver-strip-vpath.sh \
+ t/test-driver-trs-suffix-registered.sh \
+ t/test-driver-fail.sh \
+ t/test-driver-is-distributed.sh \
+ t/test-harness-vpath-rewrite.sh \
+ t/test-log.sh \
+ t/test-logs-repeated.sh \
+ t/test-metadata-global-log.sh \
+ t/test-metadata-global-result.sh \
+ t/test-metadata-recheck.sh \
+ t/test-metadata-results.sh \
+ t/test-missing.sh \
+ t/test-missing2.sh \
+ t/test-trs-basic.sh \
+ t/test-trs-recover.sh \
+ t/test-trs-recover2.sh \
+ t/test-extensions.sh \
+ t/test-extensions-cond.sh \
+ t/parse.sh \
 -t/postproc.sh \
++t/pattern-rules.sh \
++t/pattern-rules2.sh \
+ t/phony.sh \
+ t/pluseq.sh \
+ t/pluseq2.sh \
+ t/pluseq3.sh \
+ t/pluseq4.sh \
+ t/pluseq5.sh \
+ t/pluseq6.sh \
+ t/pluseq7.sh \
+ t/pluseq8.sh \
+ t/pluseq9.sh \
+ t/pluseq10.sh \
+ t/pluseq11.sh \
+ t/posixsubst-data.sh \
+ t/posixsubst-extradist.sh \
+ t/posixsubst-ldadd.sh \
+ t/posixsubst-libraries.sh \
+ t/posixsubst-ltlibraries.sh \
+ t/posixsubst-programs.sh \
+ t/posixsubst-scripts.sh \
+ t/posixsubst-sources.sh \
+ t/posixsubst-tests.sh \
 -t/pr243.sh \
 -t/pr266.sh \
+ t/ppf77.sh \
+ t/pr2.sh \
+ t/pr9.sh \
+ t/pr72.sh \
+ t/pr87.sh \
+ t/pr211.sh \
+ t/pr220.sh \
+ t/pr224.sh \
+ t/pr229.sh \
 -t/remake-all-2.sh \
+ t/pr279.sh \
+ t/pr279-2.sh \
+ t/pr287.sh \
+ t/pr300-lib.sh \
+ t/pr300-ltlib.sh \
+ t/pr300-prog.sh \
+ t/pr307.sh \
+ t/pr401.sh \
+ t/pr401b.sh \
+ t/pr401c.sh \
+ t/prefix.sh \
+ t/primary.sh \
+ t/primary2.sh \
+ t/primary3.sh \
+ t/primary-prefix-invalid-couples.tap \
+ t/primary-prefix-valid-couples.sh \
+ t/primary-prefix-couples-force-valid.sh \
+ t/primary-prefix-couples-documented-valid.sh \
+ t/print-libdir.sh \
+ t/proginst.sh \
+ t/programs-primary-rewritten.sh \
+ t/py-compile-basic.sh \
+ t/py-compile-basic2.sh \
+ t/py-compile-basedir.sh \
+ t/py-compile-destdir.sh \
+ t/py-compile-env.sh \
+ t/py-compile-option-terminate.sh \
+ t/py-compile-usage.sh \
+ t/python.sh \
+ t/python2.sh \
+ t/python3.sh \
+ t/python4.sh \
+ t/python5.sh \
+ t/python5b.sh \
+ t/python6.sh \
+ t/python7.sh \
+ t/python8.sh \
+ t/python9.sh \
+ t/python10.sh \
+ t/python11.sh \
+ t/python12.sh \
+ t/python-dist.sh \
+ t/python-vars.sh \
+ t/python-virtualenv.sh \
+ t/python-pr10995.sh \
+ t/recurs.sh \
+ t/recurs2.sh \
+ t/remake.sh \
+ t/remake1a.sh \
+ t/remake2.sh \
+ t/remake3.sh \
+ t/remake3a.sh \
+ t/remake4.sh \
+ t/remake5.sh \
+ t/remake6.sh \
+ t/remake7.sh \
+ t/remake8a.sh \
+ t/remake8b.sh \
+ t/remake9a.sh \
+ t/remake9b.sh \
+ t/remake9c.sh \
+ t/remake9d.sh \
+ t/remake10a.sh \
+ t/remake10b.sh \
+ t/remake10c.sh \
+ t/remake11.sh \
+ t/remake12.sh \
+ t/remake-all-1.sh \
 -t/remake-subdir2.sh \
+ t/remake-subdir-from-subdir.sh \
+ t/remake-subdir-gnu.sh \
+ t/remake-subdir.sh \
 -t/silent-nowarn.sh \
+ t/remake-subdir-long-time.sh \
+ t/remake-gnulib-add-acsubst.sh \
+ t/remake-gnulib-add-header.sh \
+ t/remake-gnulib-remove-header.sh \
+ t/remake-moved-m4-file.sh \
+ t/remake-deleted-m4-file.sh \
+ t/remake-renamed-m4-file.sh \
+ t/remake-renamed-m4-macro-and-file.sh \
+ t/remake-renamed-m4-macro.sh \
+ t/remake-am-pr10111.sh \
+ t/remake-m4-pr10111.sh \
+ t/remake-deleted-am-2.sh \
+ t/remake-deleted-am-subdir.sh \
+ t/remake-deleted-am.sh \
+ t/remake-renamed-am.sh \
+ t/pr8365-remake-timing.sh \
+ t/req.sh \
+ t/reqd.sh \
+ t/reqd2.sh \
+ t/repeated-options.sh \
+ t/rst-formatting.sh \
+ t/rulepat.sh \
+ t/self-check-cleanup.tap \
+ t/self-check-configure-help.sh \
+ t/self-check-dir.tap \
+ t/self-check-env-sanitize.tap \
+ t/self-check-exit.tap \
+ t/self-check-explicit-skips.sh \
+ t/self-check-is_newest.tap \
+ t/self-check-me.tap \
+ t/self-check-reexec.tap \
+ t/self-check-report.sh \
+ t/self-check-sanity.sh \
+ t/self-check-seq.tap \
+ t/self-check-is-blocked-signal.tap \
+ t/self-check-tap.sh \
+ t/self-check-unindent.tap \
+ t/sanity.sh \
+ t/scripts.sh \
+ t/seenc.sh \
+ t/silent.sh \
+ t/silent2.sh \
+ t/silent3.sh \
+ t/silent4.sh \
+ t/silent6.sh \
+ t/silent7.sh \
+ t/silent8.sh \
+ t/silent9.sh \
+ t/silentcxx.sh \
+ t/silentcxx-gcc.sh \
+ t/silentf77.sh \
+ t/silentf90.sh \
+ t/silent-amopts.sh \
+ t/silent-many-gcc.sh \
+ t/silent-many-generic.sh \
 -t/silent-nested-vars.sh \
+ t/silent-configsite.sh \
 -t/subdir7.sh \
+ t/silent-lex.sh \
+ t/silent-yacc.sh \
+ t/silent-yacc-headers.sh \
+ t/srcsub.sh \
+ t/srcsub2.sh \
+ t/space.sh \
+ t/specflg.sh \
+ t/specflg2.sh \
+ t/specflg3.sh \
+ t/specflg6.sh \
+ t/specflg7.sh \
+ t/specflg8.sh \
+ t/specflg9.sh \
+ t/specflg10.sh \
+ t/specflg-dummy.sh \
+ t/spell.sh \
+ t/spell2.sh \
+ t/spell3.sh \
+ t/spelling.sh \
+ t/spy.sh \
+ t/spy-rm.tap \
++t/spy-vpath-rewrite.sh \
+ t/stdinc.sh \
+ t/stamph2.sh \
+ t/stdlib.sh \
+ t/stdlib2.sh \
+ t/strictness-override.sh \
+ t/strictness-precedence.sh \
+ t/strip.sh \
+ t/strip2.sh \
+ t/strip3.sh \
+ t/subdir.sh \
+ t/subdir2.sh \
+ t/subdir3.sh \
+ t/subdir4.sh \
+ t/subdir5.sh \
+ t/subdir6.sh \
 -t/subobj11b.sh \
+ t/subdir8.sh \
+ t/subdir9.sh \
+ t/subdir10.sh \
+ t/subdirbuiltsources.sh \
+ t/subcond.sh \
+ t/subcond2.sh \
+ t/subcond3.sh \
+ t/subobj.sh \
+ t/subobj2.sh \
+ t/subobj4.sh \
+ t/subobj5.sh \
+ t/subobj6.sh \
+ t/subobj7.sh \
+ t/subobj8.sh \
+ t/subobj9.sh \
+ t/subobj10.sh \
+ t/subobj11a.sh \
 -t/vars3.sh \
+ t/subobj11c.sh \
+ t/subobjname.sh \
+ t/subpkg.sh \
+ t/subpkg2.sh \
+ t/subpkg3.sh \
+ t/subpkg4.sh \
+ t/subpkg-yacc.sh \
+ t/subst.sh \
+ t/subst3.sh \
+ t/subst4.sh \
+ t/subst5.sh \
+ t/subst-no-trailing-empty-line.sh \
+ t/substref.sh \
+ t/substre2.sh \
+ t/substtarg.sh \
+ t/suffix.sh \
+ t/suffix2.sh \
+ t/suffix3.tap \
+ t/suffix4.sh \
+ t/suffix5.sh \
+ t/suffix6.sh \
+ t/suffix6b.sh \
+ t/suffix6c.sh \
+ t/suffix7.sh \
+ t/suffix8.tap \
+ t/suffix9.sh \
+ t/suffix10.tap \
+ t/suffix11.tap \
+ t/suffix12.sh \
+ t/suffix13.sh \
+ t/suffix-chain.tap \
+ t/symlink.sh \
+ t/symlink2.sh \
+ t/syntax.sh \
+ t/tap-ambiguous-directive.sh \
+ t/tap-autonumber.sh \
+ t/tap-bailout.sh \
+ t/tap-bailout-leading-space.sh \
+ t/tap-bailout-and-logging.sh \
+ t/tap-bailout-suppress-badexit.sh \
+ t/tap-bailout-suppress-later-diagnostic.sh \
+ t/tap-bailout-suppress-later-errors.sh \
+ t/tap-color.sh \
+ t/tap-deps.sh \
+ t/tap-diagnostic.sh \
+ t/tap-empty-diagnostic.sh \
+ t/tap-empty.sh \
+ t/tap-escape-directive.sh \
+ t/tap-escape-directive-2.sh \
+ t/tap-exit.sh \
+ t/tap-signal.tap \
+ t/tap-fancy.sh \
+ t/tap-fancy2.sh \
+ t/tap-global-log.sh \
+ t/tap-global-result.sh \
+ t/tap-log.sh \
+ t/tap-msg0-result.sh \
+ t/tap-msg0-directive.sh \
+ t/tap-msg0-planskip.sh \
+ t/tap-msg0-bailout.sh \
+ t/tap-msg0-misc.sh \
+ t/tap-merge-stdout-stderr.sh \
+ t/tap-no-merge-stdout-stderr.sh \
+ t/tap-no-disable-hard-error.sh \
+ t/tap-no-spurious-summary.sh \
+ t/tap-no-spurious-numbers.sh \
+ t/tap-no-spurious.sh \
+ t/tap-not-ok-skip.sh \
+ t/tap-number-wordboundary.sh \
+ t/tap-numeric-description.sh \
+ t/tap-negative-numbers.sh \
+ t/tap-numbers-leading-zero.sh \
+ t/tap-out-of-order.sh \
+ t/tap-passthrough.sh \
+ t/tap-passthrough-exit.sh \
+ t/tap-plan.sh \
+ t/tap-plan-corner.sh \
+ t/tap-plan-errors.sh \
+ t/tap-plan-middle.sh \
+ t/tap-plan-whitespace.sh \
+ t/tap-plan-leading-zero.sh \
+ t/tap-plan-malformed.sh \
+ t/tap-missing-plan-and-bad-exit.sh \
+ t/tap-planskip.sh \
+ t/tap-planskip-late.sh \
+ t/tap-planskip-and-logging.sh \
+ t/tap-planskip-unplanned.sh \
+ t/tap-planskip-unplanned-corner.sh \
+ t/tap-planskip-case-insensitive.sh \
+ t/tap-planskip-whitespace.sh \
+ t/tap-planskip-badexit.sh \
+ t/tap-planskip-bailout.sh \
+ t/tap-planskip-later-errors.sh \
+ t/tap-realtime.sh \
+ t/tap-test-number-0.sh \
+ t/tap-recheck-logs.sh \
+ t/tap-result-comment.sh \
+ t/tap-todo-skip-together.sh \
+ t/tap-todo-skip-whitespace.sh \
+ t/tap-todo-skip.sh \
+ t/tap-unplanned.sh \
+ t/tap-whitespace-normalization.sh \
+ t/tap-with-and-without-number.sh \
+ t/tap-xfail-tests.sh \
+ t/tap-common-setup.sh \
+ t/tap-bad-prog.tap \
+ t/tap-basic.sh \
+ t/tap-diagnostic-custom.sh \
+ t/tap-driver-stderr.sh \
+ t/tap-doc.sh \
+ t/tap-doc2.sh \
+ t/tap-more.sh \
+ t/tap-more2.sh \
+ t/tap-recheck.sh \
+ t/tap-summary.sh \
+ t/tap-summary-color.sh \
+ t/tags.sh \
+ t/tags2.sh \
+ t/tagsub.sh \
+ t/tar.sh \
+ t/tar2.sh \
+ t/tar3.sh \
+ t/tar-override.sh \
+ t/target-cflags.sh \
+ t/targetclash.sh \
+ t/tests-environment-fd-redirect.sh \
+ t/tests-environment-and-log-compiler.sh \
+ t/txinfo.sh \
+ t/txinfo2.sh \
+ t/txinfo3.sh \
+ t/txinfo4.sh \
+ t/txinfo5.sh \
+ t/txinfo5b.sh \
+ t/txinfo6.sh \
+ t/txinfo7.sh \
+ t/txinfo8.sh \
+ t/txinfo9.sh \
+ t/txinfo10.sh \
+ t/txinfo13.sh \
+ t/txinfo16.sh \
+ t/txinfo17.sh \
+ t/txinfo19.sh \
+ t/txinfo20.sh \
+ t/txinfo21.sh \
+ t/txinfo22.sh \
+ t/txinfo23.sh \
+ t/txinfo24.sh \
+ t/txinfo25.sh \
+ t/txinfo26.sh \
+ t/txinfo27.sh \
+ t/txinfo28.sh \
+ t/txinfo29.sh \
+ t/txinfo30.sh \
+ t/txinfo31.sh \
+ t/txinfo32.sh \
+ t/txinfo33.sh \
+ t/txinfo-no-clutter.sh \
+ t/txinfo-unrecognized-extension.sh \
+ t/transform.sh \
+ t/transform2.sh \
+ t/transform3.sh \
+ t/uninstall-fail.sh \
+ t/uninstall-pr9578.sh \
+ t/unused.sh \
+ t/upc.sh \
+ t/upc2.sh \
+ t/upc3.sh \
+ t/vala.sh \
+ t/vala1.sh \
+ t/vala2.sh \
+ t/vala3.sh \
+ t/vala4.sh \
+ t/vala5.sh \
+ t/vala-vpath.sh \
+ t/vala-mix.sh \
+ t/vala-mix2.sh \
+ t/vars.sh \
++t/vars-assign.sh \
+ t/vartar.sh \
+ t/vartypos.sh \
+ t/vartypo2.sh \
+ t/version.sh \
+ t/version2.sh \
+ t/version3.sh \
+ t/version4.sh \
+ t/version6.sh \
+ t/version7.sh \
+ t/version8.sh \
++t/vpath-rewrite.sh \
+ t/vpath.sh \
+ t/vtexi.sh \
+ t/vtexi2.sh \
+ t/vtexi3.sh \
+ t/vtexi4.sh \
+ t/warnings-override.sh \
+ t/warnings-precedence.sh \
+ t/warnings-strictness-interactions.sh \
+ t/warnings-unknown.sh \
+ t/warnopts.sh \
+ t/warnings-win-over-strictness.sh \
+ t/warning-groups-win-over-strictness.sh \
+ t/werror.sh \
+ t/werror2.sh \
+ t/werror3.sh \
+ t/werror4.sh \
+ t/whoami.sh \
+ t/xsource.sh \
+ t/yacc.sh \
+ t/yacc2.sh \
+ t/yacc4.sh \
+ t/yacc5.sh \
+ t/yacc7.sh \
+ t/yacc8.sh \
+ t/yaccdry.sh \
+ t/yaccpp.sh \
+ t/yaccvpath.sh \
+ t/yacc-auxdir.sh \
+ t/yacc-basic.sh \
+ t/yacc-cxx.sh \
+ t/yacc-bison-skeleton-cxx.sh \
+ t/yacc-bison-skeleton.sh \
+ t/yacc-clean.sh \
+ t/yacc-clean-cxx.sh \
+ t/yacc-d-basic.sh \
+ t/yacc-d-cxx.sh \
+ t/yacc-d-vpath.sh \
+ t/yacc-deleted-headers.sh \
+ t/yacc-depend.sh \
+ t/yacc-depend2.sh \
+ t/yacc-dist-nobuild-subdir.sh \
+ t/yacc-dist-nobuild.sh \
+ t/yacc-line.sh \
+ t/yacc-mix-c-cxx.sh \
+ t/yacc-nodist.sh \
+ t/yacc-pr204.sh \
++t/yacc-subobj-nodep.sh \
+ t/yacc-weirdnames.sh \
+ t/yflags.sh \
+ t/yflags2.sh \
+ t/yflags-cmdline-override.sh \
+ t/yflags-conditional.sh \
+ t/yflags-d-false-positives.sh \
+ t/yflags-force-conditional.sh \
+ t/yflags-force-override.sh \
+ t/yflags-var-expand.sh \
+ t/libtool-macros.sh \
+ t/gettext-macros.sh
+ print-list-of-tests:
+       @echo $(handwritten_TESTS)
+ .PHONY: print-list-of-tests
Simple merge
diff --cc t/makej.sh
Simple merge
diff --cc t/maken.sh
Simple merge
diff --cc t/maken3.sh
Simple merge
diff --cc t/man3.sh
Simple merge
diff --cc t/man6.sh
Simple merge
diff --cc t/man8.sh
Simple merge
diff --cc t/mmodely.sh
Simple merge
diff --cc t/multlib.sh
index c5ce6403b7a4af7c53c108ec08e66643beca356d,0295ccc4578a2aa923cb319f3544037d6211e39a..53e4ef64cc57e813dd7650e120fab3e05194dcba
  # FIXME: the features tested by this script has been moved in contrib.
  # FIXME: We should move this script accordingly.
  
 -required='gcc GNUmake'
 +required=gcc
  . ./defs || Exit 1
  
- mldir=$top_testsrcdir/contrib/multilib
+ mldir=$am_top_srcdir/contrib/multilib
  mkdir m4
  cp "$mldir"/config-ml.in "$mldir"/symlink-tree .
  cp "$mldir"/multi.m4 m4
diff --cc t/objdir.sh
index 0f1f84466806d9e3a702dc274a9d26b5a2991a6e,0000000000000000000000000000000000000000..0f1f84466806d9e3a702dc274a9d26b5a2991a6e
mode 100755,000000..100755
--- /dev/null
diff --cc t/output6.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/remake10a.sh
Simple merge
diff --cc t/remake10b.sh
Simple merge
diff --cc t/remake10c.sh
Simple merge
diff --cc t/remake12.sh
Simple merge
diff --cc t/remake5.sh
Simple merge
diff --cc t/remake8a.sh
Simple merge
diff --cc t/remake8b.sh
Simple merge
diff --cc t/remake9a.sh
Simple merge
diff --cc t/remake9b.sh
Simple merge
diff --cc t/remake9c.sh
Simple merge
diff --cc t/remake9d.sh
Simple merge
diff --cc t/silent6.sh
Simple merge
index b5dd58904eb59fa078855f04e619426971cea5ff,0000000000000000000000000000000000000000..b5dd58904eb59fa078855f04e619426971cea5ff
mode 100755,000000..100755
--- /dev/null
diff --cc t/subobj11a.sh
Simple merge
diff --cc t/subobj11c.sh
Simple merge
diff --cc t/subobj4.sh
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/suffix10.tap
Simple merge
diff --cc t/suffix11.tap
Simple merge
diff --cc t/suffix12.sh
Simple merge
diff --cc t/suffix13.sh
Simple merge
diff --cc t/suffix3.tap
Simple merge
diff --cc t/suffix5.sh
Simple merge
diff --cc t/suffix6b.sh
Simple merge
diff --cc t/suffix6c.sh
Simple merge
diff --cc t/suffix8.tap
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/tap-basic.sh
Simple merge
diff --cc t/tap-color.sh
Simple merge
Simple merge
diff --cc t/tap-doc2.sh
Simple merge
Simple merge
Simple merge
diff --cc t/tap-log.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/tap-plan.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/test-log.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/txinfo21.sh
Simple merge
diff --cc t/vala-mix.sh
Simple merge
diff --cc t/vala-mix2.sh
Simple merge
diff --cc t/vala-vpath.sh
Simple merge
diff --cc t/vala2.sh
Simple merge
diff --cc t/vala3.sh
Simple merge
diff --cc t/vala5.sh
Simple merge
Simple merge
diff --cc t/version4.sh
Simple merge
diff --cc t/version7.sh
Simple merge
index 0d2db6cbc40b92dde9fe3bf6a15921d5f4fbd0f1,0000000000000000000000000000000000000000..0d2db6cbc40b92dde9fe3bf6a15921d5f4fbd0f1
mode 100755,000000..100755
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/yacc-basic.sh
Simple merge
Simple merge
Simple merge
diff --cc t/yacc-cxx.sh
Simple merge
Simple merge
diff --cc t/yacc-d-cxx.sh
Simple merge
Simple merge
Simple merge
index 80783a15162ebd8500cf6e7163bef993b4f43f30,0000000000000000000000000000000000000000..80783a15162ebd8500cf6e7163bef993b4f43f30
mode 100755,000000..100755
--- /dev/null
Simple merge
diff --cc t/yflags.sh
Simple merge
diff --cc t/yflags2.sh
Simple merge