options: don't accept "error=" for -f and -r

[bison.git] / tests / local.mk

diff --git a/tests/local.mk b/tests/local.mk
index 2cb1f3c1862e5fa2fbd5d96cd8ffdcc302c963fa..7bc8b78996d77a67e5ce052b14b6b496cbb76515 100644 (file)
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -1,6 +1,6 @@
 ## Makefile for Bison testsuite.
 
-# Copyright (C) 2000-2012 Free Software Foundation, Inc.
+# Copyright (C) 2000-2013 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
@@ -40,7 +40,6 @@ $(top_srcdir)/tests/package.m4: $(top_srcdir)/configure
 ## Generate the test suite.  ##
 ## ------------------------- ##
 
-## Leave testsuite.at first for the "testsuite" rule's $<.
 TESTSUITE_AT =                                  \
   tests/testsuite.at                            \
                                                 \
@@ -71,7 +70,9 @@ TESTSUITE = $(top_srcdir)/tests/testsuite
 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)$(PERL) -pi -e 's/\@tb\@/\t/g' $@.tmp
        $(AM_V_at)mv $@.tmp $@
 
 
@@ -108,7 +109,7 @@ maintainer-check-posix: $(RUN_TESTSUITE_deps)
 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