Merge branch 'maint'

[bison.git] / tests / local.mk

diff --git a/tests/local.mk b/tests/local.mk
index 2cb1f3c1862e5fa2fbd5d96cd8ffdcc302c963fa..dc5b6c482ffeac99b029f8580086694c6e3a71d2 100644 (file)
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -40,7 +40,6 @@ $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure
 ## Generate the test suite.  ##
 ## ------------------------- ##
 
 ## Generate the test suite.  ##
 ## ------------------------- ##
 

-## Leave testsuite.at first for the "testsuite" rule's $<.

 TESTSUITE_AT =                                  \
   tests/testsuite.at                            \
                                                 \
 TESTSUITE_AT =                                  \
   tests/testsuite.at                            \
                                                 \


@@ -71,7 +70,8 @@ TESTSUITE = $(top_srcdir)/tests/testsuite
 AUTOTEST = $(AUTOM4TE) --language=autotest
 AUTOTESTFLAGS = -I $(top_srcdir)/tests
 $(TESTSUITE): $(TESTSUITE_AT)
 AUTOTEST = $(AUTOM4TE) --language=autotest
 AUTOTESTFLAGS = -I $(top_srcdir)/tests
 $(TESTSUITE): $(TESTSUITE_AT)

-       $(AM_V_GEN)$(AUTOTEST) $(AUTOTESTFLAGS) $< -o $@.tmp
+       $(AM_V_GEN) \
+         $(AUTOTEST) $(AUTOTESTFLAGS) $(srcdir)/tests/testsuite.at -o $@.tmp

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


@@ -108,7 +108,7 @@ maintainer-check-posix: $(RUN_TESTSUITE_deps)
 maintainer-check-valgrind: $(RUN_TESTSUITE_deps)
        test -z '$(VALGRIND)' ||                                        \
          $(RUN_TESTSUITE)                                              \
 maintainer-check-valgrind: $(RUN_TESTSUITE_deps)
        test -z '$(VALGRIND)' ||                                        \
          $(RUN_TESTSUITE)                                              \

-           PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q'        \
+           PREBISON='$(VALGRIND_PREBISON)' PREPARSER='$(VALGRIND) -q'  \

            VALGRIND_OPTS='--leak-check=full --show-reachable=yes'
 
 .PHONY: maintainer-check
            VALGRIND_OPTS='--leak-check=full --show-reachable=yes'
 
 .PHONY: maintainer-check