mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-19 01:03:04 +00:00
Remove tests/Makefile.am.
* tests/Makefile.am: Rename as... * tests/local.mk: this. * Makefile.am, configure.ac: Adjust. * Makefile.am (DISTCLEANFILES): Define. (maintainer-check, maintainer-xml-check, maintainer-push-check): Remove, we no longer need to bounce to the real targets.
This commit is contained in:
Akim Demaille
10
ChangeLog
10
ChangeLog
@@ -1,3 +1,13 @@
|
|||||||
|
2008-11-15 Akim Demaille <demaille@gostai.com>
|
||||||
|
|
||||||
|
Remove tests/Makefile.am.
|
||||||
|
* tests/Makefile.am: Rename as...
|
||||||
|
* tests/local.mk: this.
|
||||||
|
* Makefile.am, configure.ac: Adjust.
|
||||||
|
* Makefile.am (DISTCLEANFILES): Define.
|
||||||
|
(maintainer-check, maintainer-xml-check, maintainer-push-check):
|
||||||
|
Remove, we no longer need to bounce to the real targets.
|
||||||
|
|
||||||
2008-11-15 Akim Demaille <demaille@gostai.com>
|
2008-11-15 Akim Demaille <demaille@gostai.com>
|
||||||
|
|
||||||
Comment changes.
|
Comment changes.
|
||||||
|
|||||||
16
Makefile.am
16
Makefile.am
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
SUBDIRS = po runtime-po lib . tests
|
SUBDIRS = po runtime-po lib .
|
||||||
if BISON_CXX_WORKS
|
if BISON_CXX_WORKS
|
||||||
SUBDIRS += examples/calc++
|
SUBDIRS += examples/calc++
|
||||||
endif
|
endif
|
||||||
@@ -32,6 +32,7 @@ EXTRA_DIST = .prev-version .version \
|
|||||||
|
|
||||||
# Initialization before completion by local.mk's.
|
# Initialization before completion by local.mk's.
|
||||||
BUILT_SOURCES =
|
BUILT_SOURCES =
|
||||||
|
DISTCLEANFILES =
|
||||||
MOSTLYCLEANFILES =
|
MOSTLYCLEANFILES =
|
||||||
include build-aux/local.mk
|
include build-aux/local.mk
|
||||||
include data/local.mk
|
include data/local.mk
|
||||||
@@ -40,18 +41,7 @@ include doc/local.mk
|
|||||||
include etc/local.mk
|
include etc/local.mk
|
||||||
include examples/local.mk
|
include examples/local.mk
|
||||||
include src/local.mk
|
include src/local.mk
|
||||||
|
include tests/local.mk
|
||||||
.PHONY: maintainer-check
|
|
||||||
maintainer-check:
|
|
||||||
cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
|
|
||||||
|
|
||||||
.PHONY: maintainer-push-check
|
|
||||||
maintainer-push-check:
|
|
||||||
cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
|
|
||||||
|
|
||||||
.PHONY: maintainer-xml-check
|
|
||||||
maintainer-xml-check:
|
|
||||||
cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
|
|
||||||
|
|
||||||
# See comments in build-aux/git-version-gen. However, we make .version depend
|
# See comments in build-aux/git-version-gen. However, we make .version depend
|
||||||
# on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the
|
# on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ AC_CONFIG_FILES([etc/bench.pl], [chmod +x etc/bench.pl])
|
|||||||
|
|
||||||
# Initialize the test suite.
|
# Initialize the test suite.
|
||||||
AC_CONFIG_TESTDIR(tests)
|
AC_CONFIG_TESTDIR(tests)
|
||||||
AC_CONFIG_FILES([tests/Makefile tests/atlocal])
|
AC_CONFIG_FILES([tests/atlocal])
|
||||||
AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
|
AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
|
||||||
AC_CHECK_PROGS([VALGRIND], [valgrind])
|
AC_CHECK_PROGS([VALGRIND], [valgrind])
|
||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ BISON = $(top_builddir)/tests/bison
|
|||||||
BISON_IN = $(top_srcdir)/tests/bison.in
|
BISON_IN = $(top_srcdir)/tests/bison.in
|
||||||
|
|
||||||
$(BISON): $(BISON_IN)
|
$(BISON): $(BISON_IN)
|
||||||
cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) bison
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) tests/bison
|
||||||
|
|
||||||
## ------------ ##
|
## ------------ ##
|
||||||
## Extracting. ##
|
## Extracting. ##
|
||||||
|
|||||||
@@ -1,103 +0,0 @@
|
|||||||
## Process this file with automake to create Makefile.in.
|
|
||||||
|
|
||||||
## Makefile for Bison testsuite.
|
|
||||||
|
|
||||||
## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 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
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# 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) testsuite package.m4
|
|
||||||
|
|
||||||
DISTCLEANFILES = atconfig $(check_SCRIPTS)
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
|
|
||||||
|
|
||||||
## ------------ ##
|
|
||||||
## package.m4. ##
|
|
||||||
## ------------ ##
|
|
||||||
|
|
||||||
$(srcdir)/package.m4: $(top_srcdir)/configure
|
|
||||||
{ \
|
|
||||||
echo '# Signature of the current package.'; \
|
|
||||||
echo 'm4_define([AT_PACKAGE_NAME], [$(PACKAGE_NAME)])'; \
|
|
||||||
echo 'm4_define([AT_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])'; \
|
|
||||||
echo 'm4_define([AT_PACKAGE_VERSION], [$(PACKAGE_VERSION)])'; \
|
|
||||||
echo 'm4_define([AT_PACKAGE_STRING], [$(PACKAGE_STRING)])'; \
|
|
||||||
echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \
|
|
||||||
} >$(srcdir)/package.m4
|
|
||||||
|
|
||||||
## ------------ ##
|
|
||||||
## Test suite. ##
|
|
||||||
## ------------ ##
|
|
||||||
|
|
||||||
TESTSUITE_AT = \
|
|
||||||
local.at \
|
|
||||||
testsuite.at \
|
|
||||||
input.at \
|
|
||||||
output.at sets.at reduce.at skeletons.at \
|
|
||||||
synclines.at headers.at actions.at conflicts.at \
|
|
||||||
calc.at \
|
|
||||||
torture.at existing.at regression.at \
|
|
||||||
c++.at \
|
|
||||||
java.at \
|
|
||||||
cxx-type.at glr-regression.at \
|
|
||||||
push.at
|
|
||||||
|
|
||||||
TESTSUITE = $(srcdir)/testsuite
|
|
||||||
|
|
||||||
AUTOTEST = $(AUTOM4TE) --language=autotest
|
|
||||||
$(TESTSUITE): package.m4 $(TESTSUITE_AT)
|
|
||||||
$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
|
|
||||||
mv $@.tmp $@
|
|
||||||
|
|
||||||
atconfig: $(top_builddir)/config.status
|
|
||||||
cd $(top_builddir) && ./config.status tests/$@
|
|
||||||
|
|
||||||
clean-local:
|
|
||||||
test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
|
|
||||||
|
|
||||||
check-local: atconfig atlocal $(TESTSUITE)
|
|
||||||
$(SHELL) $(TESTSUITE) $(TESTSUITEFLAGS)
|
|
||||||
|
|
||||||
check_SCRIPTS = bison
|
|
||||||
|
|
||||||
# Run the test suite on the *installed* tree.
|
|
||||||
installcheck-local:
|
|
||||||
$(SHELL) $(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
|
|
||||||
|
|
||||||
# Be real mean with it.
|
|
||||||
.PHONY: maintainer-check-g++
|
|
||||||
maintainer-check-g++: $(TESTSUITE)
|
|
||||||
$(TESTSUITE) CC='$(CXX)'
|
|
||||||
|
|
||||||
.PHONY: maintainer-check-posix
|
|
||||||
maintainer-check-posix: $(TESTSUITE)
|
|
||||||
$(TESTSUITE) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112
|
|
||||||
|
|
||||||
.PHONY: maintainer-check-valgrind
|
|
||||||
maintainer-check-valgrind: $(TESTSUITE)
|
|
||||||
test -z '$(VALGRIND)' || \
|
|
||||||
VALGRIND_OPTS='--leak-check=full --show-reachable=yes' \
|
|
||||||
$(TESTSUITE) PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q'
|
|
||||||
|
|
||||||
.PHONY: maintainer-check
|
|
||||||
maintainer-check: maintainer-check-posix maintainer-check-valgrind maintainer-check-g++
|
|
||||||
|
|
||||||
.PHONY: maintainer-push-check
|
|
||||||
maintainer-push-check:
|
|
||||||
BISON_USE_PUSH_FOR_PULL=1 $(MAKE) $(AM_MAKEFLAGS) maintainer-check
|
|
||||||
|
|
||||||
.PHONY: maintainer-xml-check
|
|
||||||
maintainer-xml-check:
|
|
||||||
BISON_TEST_XML=1 $(MAKE) $(AM_MAKEFLAGS) maintainer-check
|
|
||||||
116
tests/local.mk
Normal file
116
tests/local.mk
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
## Makefile for Bison testsuite.
|
||||||
|
|
||||||
|
## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 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
|
||||||
|
## the Free Software Foundation, either version 3 of the License, or
|
||||||
|
## (at your option) any later version.
|
||||||
|
##
|
||||||
|
## This program is distributed in the hope that it will be useful,
|
||||||
|
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
## GNU General Public License for more details.
|
||||||
|
##
|
||||||
|
## 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
|
||||||
|
|
||||||
|
DISTCLEANFILES += tests/atconfig $(check_SCRIPTS)
|
||||||
|
MAINTAINERCLEANFILES += $(TESTSUITE)
|
||||||
|
|
||||||
|
## ------------ ##
|
||||||
|
## package.m4. ##
|
||||||
|
## ------------ ##
|
||||||
|
|
||||||
|
$(top_srcdir)/tests/package.m4: $(top_srcdir)/configure
|
||||||
|
rm -f $@ $@.tmp
|
||||||
|
{ \
|
||||||
|
echo '# Signature of the current package.'; \
|
||||||
|
echo 'm4_define([AT_PACKAGE_NAME], [$(PACKAGE_NAME)])'; \
|
||||||
|
echo 'm4_define([AT_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])'; \
|
||||||
|
echo 'm4_define([AT_PACKAGE_VERSION], [$(PACKAGE_VERSION)])'; \
|
||||||
|
echo 'm4_define([AT_PACKAGE_STRING], [$(PACKAGE_STRING)])'; \
|
||||||
|
echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \
|
||||||
|
} >$@.tmp
|
||||||
|
mv $@.tmp $@
|
||||||
|
|
||||||
|
## ------------ ##
|
||||||
|
## 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/output.at \
|
||||||
|
tests/push.at \
|
||||||
|
tests/reduce.at \
|
||||||
|
tests/regression.at \
|
||||||
|
tests/sets.at \
|
||||||
|
tests/skeletons.at \
|
||||||
|
tests/synclines.at \
|
||||||
|
tests/testsuite.at \
|
||||||
|
tests/torture.at
|
||||||
|
|
||||||
|
TESTSUITE = $(top_srcdir)/tests/testsuite
|
||||||
|
|
||||||
|
AUTOTEST = $(AUTOM4TE) --language=autotest
|
||||||
|
AUTOTEST_FLAGS = -I $(top_srcdir)/tests
|
||||||
|
$(TESTSUITE): tests/package.m4 $(TESTSUITE_AT)
|
||||||
|
$(AUTOTEST) $(AUTOTEST_FLAGS) $(top_srcdir)/tests/testsuite.at -o $@.tmp
|
||||||
|
mv $@.tmp $@
|
||||||
|
|
||||||
|
tests/atconfig: $(top_builddir)/config.status
|
||||||
|
./config.status tests/$@
|
||||||
|
|
||||||
|
clean-local: clean-local-tests
|
||||||
|
clean-local-tests:
|
||||||
|
test ! -f $(TESTSUITE) || cd tests && ../$(TESTSUITE) --clean
|
||||||
|
|
||||||
|
check-local: tests/atconfig tests/atlocal $(TESTSUITE)
|
||||||
|
# Move into tests/ so that testsuite.dir etc. be created there.
|
||||||
|
cd tests && ../$(TESTSUITE) $(TESTSUITEFLAGS)
|
||||||
|
|
||||||
|
check_SCRIPTS = tests/bison
|
||||||
|
|
||||||
|
# Run the test suite on the *installed* tree.
|
||||||
|
installcheck-local:
|
||||||
|
cd tests && ../$(TESTSUITE) AUTOTEST_PATH="$(bindir)" $(TESTSUITEFLAGS)
|
||||||
|
|
||||||
|
# Be real mean with it.
|
||||||
|
.PHONY: maintainer-check-g++
|
||||||
|
maintainer-check-g++: $(TESTSUITE)
|
||||||
|
cd tests && ../$(TESTSUITE) CC='$(CXX)'
|
||||||
|
|
||||||
|
.PHONY: maintainer-check-posix
|
||||||
|
maintainer-check-posix: $(TESTSUITE)
|
||||||
|
cd tests && ../$(TESTSUITE) POSIXLY_CORRECT=1 _POSIX2_VERSION=200112
|
||||||
|
|
||||||
|
.PHONY: maintainer-check-valgrind
|
||||||
|
maintainer-check-valgrind: $(TESTSUITE)
|
||||||
|
test -z '$(VALGRIND)' || \
|
||||||
|
VALGRIND_OPTS='--leak-check=full --show-reachable=yes' \
|
||||||
|
cd tests && \
|
||||||
|
../$(TESTSUITE) PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q'
|
||||||
|
|
||||||
|
.PHONY: maintainer-check
|
||||||
|
maintainer-check: maintainer-check-posix maintainer-check-valgrind maintainer-check-g++
|
||||||
|
|
||||||
|
.PHONY: maintainer-push-check
|
||||||
|
maintainer-push-check:
|
||||||
|
BISON_USE_PUSH_FOR_PULL=1 $(MAKE) $(AM_MAKEFLAGS) maintainer-check
|
||||||
|
|
||||||
|
.PHONY: maintainer-xml-check
|
||||||
|
maintainer-xml-check:
|
||||||
|
BISON_TEST_XML=1 $(MAKE) $(AM_MAKEFLAGS) maintainer-check
|
||||||
Reference in New Issue
Block a user