diff options
author | Eric Blake <ebb9@byu.net> | 2008-10-08 22:00:39 -0600 |
---|---|---|
committer | Eric Blake <ebb9@byu.net> | 2008-10-09 10:52:13 -0600 |
commit | 22f0a1243d291d8299c210417192ee4ecd707abb (patch) | |
tree | bb2a6643d22c32071522cef30f745e093f560d36 | |
parent | 21d7d8d495676649673124f16448b6576818fc1f (diff) | |
download | m4-22f0a1243d291d8299c210417192ee4ecd707abb.tar.gz |
Clean up testsuite invocation.
* tests/atlocal.in: Fix copyright notice.
* Makefile.am (TESTS_ENVIRONMENT): Delete; it wasn't being used.
(check-local, installcheck-local): Adjust clients. Add missing
dependency.
Signed-off-by: Eric Blake <ebb9@byu.net>
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | Makefile.am | 21 | ||||
-rw-r--r-- | tests/atlocal.in | 17 |
3 files changed, 30 insertions, 16 deletions
@@ -1,3 +1,11 @@ +2008-10-09 Eric Blake <ebb9@byu.net> + + Clean up testsuite invocation. + * tests/atlocal.in: Fix copyright notice. + * Makefile.am (TESTS_ENVIRONMENT): Delete; it wasn't being used. + (check-local, installcheck-local): Adjust clients. Add missing + dependency. + 2008-09-25 Eric Blake <ebb9@byu.net> Tweak error message on command line failure. diff --git a/Makefile.am b/Makefile.am index f6a2b68d..35b555bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -372,16 +372,6 @@ EXTRA_DIST += $(TESTSUITE) $(TESTSUITE_AT) $(OTHER_FILES) \ tests/generate.awk \ $(srcdir)/tests/package.m4 -# Be sure to reexport important environment variables: -TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \ - CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \ - LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \ - OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" CONFIG_SHELL="$(SHELL)" \ - abs_top_builddir="$(abs_top_builddir)" \ - CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \ - F77="$(F77)" FFLAGS="$(FFLAGS)" \ - GCJ="$(GCJ)" GCJFLAGS="$(GCJFLAGS)" - # Using variables so that this snippet is not too wide and can # be used as is in Texinfo @example/@end example. m4_texinfo = $(srcdir)/doc/m4.texinfo @@ -413,15 +403,16 @@ tests/atconfig: config.status DISTCLEANFILES += tests/atconfig # Hook the test suite into the check rule -check-local: tests/atconfig tests/m4 $(TESTSUITE) $(check_LTLIBRARIES) - $(SHELL) '$(srcdir)/tests/testsuite' -C tests \ - $(TESTS_ENVIRONMENT) $(TESTSUITEFLAGS) +check-local: tests/atconfig tests/atlocal tests/m4 $(TESTSUITE) \ + $(check_LTLIBRARIES) + $(SHELL) '$(srcdir)/tests/testsuite' -C tests $(TESTSUITEFLAGS) # Run the test suite on the *installed* tree, including any renames # the user requested. -installcheck-local: tests/atconfig $(TESTSUITE) $(check_LTLIBRARIES) +installcheck-local: tests/atconfig tests/atlocal $(TESTSUITE) \ + $(check_LTLIBRARIES) $(SHELL) '$(srcdir)/tests/testsuite' -C tests \ - $(TESTS_ENVIRONMENT) AUTOTEST_PATH="$(bindir)" \ + AUTOTEST_PATH="$(bindir)" \ M4="`echo m4 | sed '$(program_transform_name)'`" $(TESTSUITEFLAGS) # Enough users install GNU M4 as gm4 that we make sure 'make installcheck' diff --git a/tests/atlocal.in b/tests/atlocal.in index 1462e8d5..69749879 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -1,7 +1,22 @@ # -*- shell-script -*- # @configure_input@ # Configurable variable values for M4 test suite. -# Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2006, 2008 Free Software Foundation, Inc. + +# This file is part of GNU M4. +# +# GNU M4 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. +# +# GNU M4 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/>. # Some tests cannot be performed with all the configurations. USE_GMP=@USE_GMP@ |