From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 26 Jul 2012 16:16:47 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v1.12b~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=106428fe4e73d5f9f5e7cc2e44a1e9b3b85606c1;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint: (38 commits)
  maintcheck: fixup list of files in $(xdefs)
  tests: never source test-defs.sh directly, source test-lib.sh instead
  runtest: sanitize test environment
  tests: remove an obsolescent self test
  tests: "am_using_tap=yes" -> "am_test_protocol=tap"
  tests: protect test libs against multiple inclusion
  configure: testsuite shell can return early from "dot-sourced" files
  tests: move sanitization and "Bournification" in the generic test lib
  tests: source test defs in the generic test lib
  test defs: no need to re-add $srcdir/t/ax to $PATH
  tests: split test libs into "generic" and "automake-specific"
  test setup: move actual calling of testsuite setup in ./defs
  test setup: merge definitions of function for simple tests
  test init: refactor: new function 'am_test_setup'
  test init: refactor: move displaying of debugging info later
  test init: refactor: new function 'am_setup_testdir'
  test init: refactor: new function 'am_set_exit_traps'
  configure: testsuite shell set exit traps in shell functions
  test init: refactor: new function 'am_exit_trap'
  test init: refactor: new function 'process_requirements'
  ...

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

106428fe4e73d5f9f5e7cc2e44a1e9b3b85606c1
diff --cc Makefile.am
index a5332d373,20cb86d17..028b07014
--- a/Makefile.am
+++ b/Makefile.am
@@@ -374,18 -392,20 +387,25 @@@ EXTRA_DIST += gen-testsuite-par
  $(generated_TESTS): $(srcdir)/gen-testsuite-part
  $(srcdir)/t/testsuite-part.am: $(srcdir)/gen-testsuite-part Makefile.am
  
 +# Hand-written tests for stuff in 'contrib/'.
 +include $(srcdir)/contrib/t/local.am
 +TESTS += $(contrib_TESTS)
 +EXTRA_DIST += $(contrib_TESTS)
 +
- # Static dependencies valid for each test case.
- check_SCRIPTS = t/wrap/aclocal-$(APIVERSION) t/wrap/automake-$(APIVERSION)
- dist_check_DATA = \
-   t/ax/test-init.sh  \
-   t/ax/plain-functions.sh  \
+ # Static dependencies valid for each test case (also further
+ # extended later).  Note that use 'noinst_' rather than 'check_'
+ # as the prefix, because we really want them to be built by
+ # "make all".  This makes it easier to run the test cases by
+ # hand after having simply configured and built the package.
+ 
+ nodist_noinst_SCRIPTS = \
+   t/wrap/aclocal-$(APIVERSION) \
+   t/wrap/automake-$(APIVERSION)
+ 
+ dist_noinst_DATA = \
+   t/ax/test-lib.sh \
+   t/ax/am-test-lib.sh \
    t/ax/tap-functions.sh
- nodist_check_DATA = defs-static
  
  # Few more static dependencies.
  t/distcheck-missing-m4.log: t/ax/distcheck-hook-m4.am
@@@ -462,7 -483,7 +483,7 @@@ check-local: check-tests-synta
  .PHONY: check-tests-syntax
  
  ## Checking the list of tests.
- test_subdirs = t t/pm t/perf contrib/t
 -test_subdirs = t t/pm
++test_subdirs = t t/pm contrib/t
  include $(srcdir)/t/CheckListOfTests.am
  
  # Run the testsuite with the installed aclocal and automake.
diff --cc t/tap-realtime.sh
index 97b035c37,92d78313b..fcac95fe5
--- a/t/tap-realtime.sh
+++ b/t/tap-realtime.sh
@@@ -53,10 -53,8 +53,10 @@@ f
  
  cat > Makefile.am << 'END'
  TESTS = all.test
 +AM_COLOR_TESTS= no
  END
 +
- . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+ . tap-setup.sh
  
  cat > all.test <<'END'
  #! /bin/sh