tests: fix regressions.

[bison.git] / tests / local.mk

diff --git a/tests/local.mk b/tests/local.mk
index 3466a4feb0ecb47a6d1810bd7b84ae591f3976a9..5bb587d6f034cd0ae1fb58064497d0f566982e86 100644 (file)
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -1,6 +1,6 @@
 ## Makefile for Bison testsuite.
 
 ## Makefile for Bison testsuite.
 

-## Copyright (C) 2000-2011 Free Software Foundation, Inc.
+## Copyright (C) 2000-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
 
 ## 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


@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

-EXTRA_DIST += $(TESTSUITE_AT) tests/testsuite tests/package.m4
+EXTRA_DIST += $(TESTSUITE_AT) tests/testsuite

 
 DISTCLEANFILES       += tests/atconfig $(check_SCRIPTS)
 MAINTAINERCLEANFILES += $(TESTSUITE)
 
 DISTCLEANFILES       += tests/atconfig $(check_SCRIPTS)
 MAINTAINERCLEANFILES += $(TESTSUITE)


@@ -25,8 +25,8 @@ MAINTAINERCLEANFILES += $(TESTSUITE)
 ## ------------ ##
 
 $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure
 ## ------------ ##
 
 $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure

-       rm -f $@ $@.tmp
-       { \
+       $(AM_V_GEN)rm -f $@ $@.tmp
+       $(AM_V_at){ \

          echo '# Signature of the current package.'; \
          echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])'; \
          echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])'; \
          echo '# Signature of the current package.'; \
          echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])'; \
          echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])'; \


@@ -34,33 +34,36 @@ $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure
          echo 'm4_define([AT_PACKAGE_STRING],    [$(PACKAGE_STRING)])'; \
          echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \
        } >$@.tmp
          echo 'm4_define([AT_PACKAGE_STRING],    [$(PACKAGE_STRING)])'; \
          echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \
        } >$@.tmp

-       mv $@.tmp $@
+       $(AM_V_at)mv $@.tmp $@

 
 ## ------------ ##
 ## Test suite.  ##
 ## ------------ ##
 
 
 ## ------------ ##
 ## Test suite.  ##
 ## ------------ ##
 

-TESTSUITE_AT =                                 \
-  tests/actions.at                             \
-  tests/c++.at                                 \
-  tests/calc.at                                        \
-  tests/conflicts.at                           \
-  tests/cxx-type.at                            \
-  tests/existing.at                            \
-  tests/glr-regression.at                      \
-  tests/headers.at                             \
-  tests/input.at                               \
-  tests/java.at                                        \
-  tests/local.at                               \
-  tests/named-refs.at                          \
-  tests/output.at                              \
-  tests/push.at                                        \
-  tests/reduce.at                              \
-  tests/regression.at                          \
-  tests/sets.at                                        \
-  tests/skeletons.at                           \
-  tests/synclines.at                           \
-  tests/testsuite.at                           \
+## Leave testsuite.at first for the "testsuite" rule's $<.
+TESTSUITE_AT =                                  \
+  tests/testsuite.at                            \
+                                                \
+  tests/actions.at                              \
+  tests/c++.at                                  \
+  tests/calc.at                                 \
+  tests/conflicts.at                            \
+  tests/cxx-type.at                             \
+  tests/existing.at                             \
+  tests/glr-regression.at                       \
+  tests/headers.at                              \
+  tests/input.at                                \
+  tests/java.at                                 \
+  tests/local.at                                \
+  tests/named-refs.at                           \
+  tests/output.at                               \
+  tests/package.m4                              \
+  tests/push.at                                 \
+  tests/reduce.at                               \
+  tests/regression.at                           \
+  tests/sets.at                                 \
+  tests/skeletons.at                            \
+  tests/synclines.at                            \

   tests/torture.at
 
 TESTSUITE = $(top_srcdir)/tests/testsuite
   tests/torture.at
 
 TESTSUITE = $(top_srcdir)/tests/testsuite


@@ -68,9 +71,9 @@ RUN_TESTSUITE = $(TESTSUITE) -C tests $(TESTSUITEFLAGS)
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
 AUTOTESTFLAGS = -I $(top_srcdir)/tests
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
 AUTOTESTFLAGS = -I $(top_srcdir)/tests

-$(TESTSUITE): $(top_srcdir)/tests/package.m4 $(TESTSUITE_AT)
-       $(AUTOTEST) $(AUTOTESTFLAGS) $(top_srcdir)/tests/testsuite.at -o $@.tmp
-       mv $@.tmp $@
+$(TESTSUITE): $(TESTSUITE_AT)
+       $(AM_V_GEN)$(AUTOTEST) $(AUTOTESTFLAGS) $< -o $@.tmp
+       $(AM_V_at)mv $@.tmp $@

 
 clean-local: clean-local-tests
 clean-local-tests:
 
 clean-local: clean-local-tests
 clean-local-tests:


@@ -80,7 +83,7 @@ check-local: tests/atconfig tests/atlocal $(TESTSUITE)
 # Move into tests/ so that testsuite.dir etc. be created there.
        $(RUN_TESTSUITE)
 
 # Move into tests/ so that testsuite.dir etc. be created there.
        $(RUN_TESTSUITE)
 

-check_SCRIPTS = tests/bison
+check_SCRIPTS = $(BISON)

 
 # Run the test suite on the *installed* tree.
 installcheck-local:
 
 # Run the test suite on the *installed* tree.
 installcheck-local: