[PATCH 2/2] build: run checks in distinct directories

[Theophile Ranquet]

* tests/local.mk (maintainer-release-check) Import this rule from maint. Run
maintainer-checks in separate directories.
* configure.ac (AC_CONFIG_TESTDIR), tests/local.at: Adjust paths.
---
 configure.ac   |  2 +-
 tests/local.at |  9 +++++----
 tests/local.mk | 20 ++++++++++++++------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index eb39c61..a4e0233 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,7 @@ AC_SUBST([aclocaldir])
 AC_CONFIG_FILES([etc/bench.pl], [chmod +x etc/bench.pl])
 
 # Initialize the test suite.
-AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_TESTDIR([tests], [$ac_abs_top_builddir/tests])
 AC_CONFIG_FILES([tests/atlocal])
 AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 AC_CHECK_PROGS([VALGRIND], [valgrind])
diff --git a/tests/local.at b/tests/local.at
index f7a6471..48d8cfa 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -464,7 +464,7 @@ AT_BISON_CHECK_NO_XML($@)])
 # --------------------------------------------------
 # Low-level macro to run bison once.
 m4_define([AT_BISON_CHECK_],
-[AT_CHECK(AT_QUELL_VALGRIND[[ bison ]]$@)])
+[AT_CHECK(AT_QUELL_VALGRIND[[$abs_top_builddir/tests/bison ]]$@)])
 
 
 # AT_BISON_CHECK_WARNINGS(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
@@ -515,7 +515,8 @@ fi]dnl
 # when a tortured grammar's XML is known to be too large for xsltproc to
 # handle.
 m4_define([AT_BISON_CHECK_NO_XML],
-[AT_CHECK(m4_null_if([$2], [], [AT_QUELL_VALGRIND ])[[bison ]]$@)
+[AT_CHECK(m4_null_if([$2], [], [AT_QUELL_VALGRIND ])
+          [[$abs_top_builddir/tests/bison ]]$@)
 AT_BISON_CHECK_WARNINGS($@)])
 
 # AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
@@ -617,7 +618,7 @@ m4_define([AT_JAVA_COMPILE],
 [AT_KEYWORDS(java)
 AT_SKIP_IF([[test -z "$CONF_JAVAC"]])
 AT_SKIP_IF([[test -z "$CONF_JAVA"]])
-AT_CHECK([[$SHELL ../../../javacomp.sh ]$1],
+AT_CHECK([[$SHELL $abs_top_builddir/javacomp.sh ]$1],
          [[0]], [ignore], [ignore])])
 
 # AT_LANG_COMPILE(OUTPUT, [SOURCES = OUTPUT.c]
@@ -727,7 +728,7 @@ AT_CHECK([sed >&2 -e '/^profiling:.*:Merge mismatch for 
summaries/d' stderr],
 # AT_JAVA_PARSER_CHECK(COMMAND, EXIT-STATUS, EXPOUT, EXPERR, [PRE])
 # -----------------------------------------------------------------
 m4_define([AT_JAVA_PARSER_CHECK],
-[AT_CHECK([$5[ $SHELL ../../../javaexec.sh ]$1], [$2], [$3], [$4])])
+[AT_CHECK([$5[ $SHELL $abs_top_builddir/javaexec.sh ]$1], [$2], [$3], [$4])])
 
 
 # AT_TEST_TABLES_AND_PARSE(TITLE, COND-VALUE, TEST-SPEC,
diff --git a/tests/local.mk b/tests/local.mk
index dc5b6c4..bf964ac 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -79,8 +79,13 @@ $(TESTSUITE): $(TESTSUITE_AT)
 ## Run the test suite.  ##
 ## -------------------- ##
 
-# Move into tests/ so that testsuite.dir etc. be created there.
-RUN_TESTSUITE = $(TESTSUITE) -C tests $(TESTSUITEFLAGS)
+# Move into tests/ so that testsuite.dir etc. be created there.  If a suffix is
+# specified, create it in a corresponding subdirectory of tests/.
+RUN_TESTSUITE = dir=tests/$$suf;                                       \
+               test -d $$dir || mkdir $$dir;                           \
+               test -f tests/$$dir/atconfig || cp tests/atconfig $$dir;\
+               test -f tests/$$dir/atlocal  || cp tests/atlocal  $$dir;\
+               $(TESTSUITE) -C $$dir $(TESTSUITEFLAGS)
 check_SCRIPTS = $(BISON) tests/atconfig tests/atlocal
 RUN_TESTSUITE_deps = $(TESTSUITE) $(check_SCRIPTS)
 
@@ -98,16 +103,16 @@ installcheck-local: $(RUN_TESTSUITE_deps)
 # Be real mean with it.
 .PHONY: maintainer-check-g++
 maintainer-check-g++: $(RUN_TESTSUITE_deps)
-       $(RUN_TESTSUITE) --compile-c-with-cxx
+       suf=$@; $(RUN_TESTSUITE) --compile-c-with-cxx
 
 .PHONY: maintainer-check-posix
 maintainer-check-posix: $(RUN_TESTSUITE_deps)
-       $(RUN_TESTSUITE) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112
+       suf=$@; $(RUN_TESTSUITE) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112
 
 .PHONY: maintainer-check-valgrind
 maintainer-check-valgrind: $(RUN_TESTSUITE_deps)
        test -z '$(VALGRIND)' ||                                        \
-         $(RUN_TESTSUITE)                                              \
+         suf=$@; $(RUN_TESTSUITE)                                      \
            PREBISON='$(VALGRIND_PREBISON)' PREPARSER='$(VALGRIND) -q'  \
            VALGRIND_OPTS='--leak-check=full --show-reachable=yes'
 
@@ -121,5 +126,8 @@ maintainer-push-check:
 
 .PHONY: maintainer-xml-check
 maintainer-xml-check:
-       $(MAKE) $(AM_MAKEFLAGS) maintainer-check                \
+       $(MAKE) $(AM_MAKEFLAGS) maintainer-check                        \
          TESTSUITEFLAGS='BISON_TEST_XML=1 $(TESTSUITEFLAGS)'
+
+.PHONY: maintainer-release-check
+maintainer-release-check: maintainer-check maintainer-push-check 
maintainer-xml-check
-- 
1.8.0