[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/7] tests: merge tests/check.mk into tests/Makefile.am
|
From: |
Stefano Lattarini |
|
Subject: |
[PATCH 1/7] tests: merge tests/check.mk into tests/Makefile.am |
|
Date: |
Thu, 30 Aug 2012 14:13:07 +0200 |
The separation has become unnecessary after all the ancient
'tests/*/Makefile.am' makefiles have been merged into the
"more-top-level" one 'tests/Makefile.am'.
* tests/check.mk: Merge ...
* tests/Makefile.am: ... in here. Some comments tweaking while
at it.
---
tests/Makefile.am | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
tests/check.mk | 94 -----------------------------------------------------
2 files changed, 95 insertions(+), 96 deletions(-)
delete mode 100644 tests/check.mk
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 87d6cad..eed4e2e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,100 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-.
+## Copyright (C) 2007-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
+## 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/>.
+
+# Ensure that all version-controlled executable files are listed in TESTS.
+# Collect test names from the line matching /^TESTS = \\$$/ to the following
+# one that does not end in '\'.
+_v = TESTS
+_w = root_tests
+vc_exe_in_TESTS: Makefile
+ $(AM_V_GEN)if test -d $(top_srcdir)/.git && test $(srcdir) = .; then \
+ { \
+ for list in $(_v) $(_w); do \
+ sed -n "/^$$list =[ ]*\\\\$$/,/[^\]$$/p" Makefile.am | \
+ sed -n 's/^ *\([^$$ ]\{1,\}\).*/\1/p'; \
+ done; \
+ for f in `cd $(top_srcdir) && \
+ build-aux/vc-list-files $(subdir) | sed 's!^$(subdir)/!!'`; do \
+ test -f "$$f" && test -x "$$f" && echo "$$f"; \
+ done; \
+ } | sort | uniq -u | grep . && exit 1 ||:; \
+ else :; fi
+
+check: vc_exe_in_TESTS
+.PHONY: vc_exe_in_TESTS
+
+CLEANFILES =
+CLEANFILES += .built-programs
+check_DATA = .built-programs
+.built-programs: $(top_srcdir)/src/Makefile.am
+ $(AM_V_GEN)(cd $(top_builddir)/src \
+ && MAKEFLAGS= $(MAKE) -s built_programs.list) \
+ > $@-t && mv $@-t $@
+
+# '$f' is set by the Automake-generated test harness to the path of the
+# current test script stripped of VPATH components, and is used by the
+# shell-or-perl script to determine the name of the temporary files to be
+# used. Note that $f is a shell variable, not a make macro, so the use of
+# '$$f' below is correct, and not a typo.
+LOG_COMPILER = \
+ $(SHELL) $(srcdir)/shell-or-perl \
+ --test-name "$$f" --srcdir '$(srcdir)' \
+ --shell '$(SHELL)' --perl '$(PERL)' --
+
+# Note that the first lines are statements. They ensure that environment
+# variables that can perturb tests are unset or set to expected values.
+# The rest are envvar settings that propagate build-related Makefile
+# variables to test scripts.
+TESTS_ENVIRONMENT = \
+ . $(srcdir)/lang-default; \
+ tmp__=$${TMPDIR-/tmp}; \
+ test -d "$$tmp__" && test -w "$$tmp__" || tmp__=.; \
+ . $(srcdir)/envvar-check; \
+ TMPDIR=$$tmp__; export TMPDIR; \
+ export \
+ VERSION='$(VERSION)' \
+ LOCALE_FR='$(LOCALE_FR)' \
+ LOCALE_FR_UTF8='$(LOCALE_FR_UTF8)' \
+ abs_top_builddir='$(abs_top_builddir)' \
+ abs_top_srcdir='$(abs_top_srcdir)' \
+ abs_srcdir='$(abs_srcdir)' \
+ built_programs="`cat .built-programs`" \
+ host_os=$(host_os) \
+ host_triplet='$(host_triplet)' \
+ srcdir='$(srcdir)' \
+ top_srcdir='$(top_srcdir)' \
+ CONFIG_HEADER='$(abs_top_builddir)/$(CONFIG_INCLUDE)' \
+ CU_TEST_NAME=`basename '$(abs_srcdir)'`,`echo $$tst|sed 's,^\./,,;s,/,-,g'` \
+ CC='$(CC)' \
+ AWK='$(AWK)' \
+ EGREP='$(EGREP)' \
+ EXEEXT='$(EXEEXT)' \
+ MAKE=$(MAKE) \
+ PACKAGE_BUGREPORT='$(PACKAGE_BUGREPORT)' \
+ PACKAGE_VERSION=$(PACKAGE_VERSION) \
+ PERL='$(PERL)' \
+ PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \
+ ; test -d /usr/xpg4/bin && PATH='/usr/xpg4/bin$(PATH_SEPARATOR)'"$$PATH"; \
+ PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \
+ ; 9>&2
+
+# On failure, display the global testsuite log on stdout.
+VERBOSE = yes
+
# Sort in traditional ASCII order, regardless of the current locale;
# otherwise we may get into trouble with distinct strings that the
# current locale considers to be equal.
@@ -713,5 +808,3 @@ pr_data = \
pr/ttb3-0FF \
pr/ttb3-FF \
pr/w72l24f-ll
-
-include $(srcdir)/check.mk
diff --git a/tests/check.mk b/tests/check.mk
deleted file mode 100644
index 0e08f6d..0000000
--- a/tests/check.mk
+++ /dev/null
@@ -1,94 +0,0 @@
-# Include this file at the end of each tests/*/Makefile.am.
-# Copyright (C) 2007-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
-# 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/>.
-
-# Ensure that all version-controlled executable files are listed in TESTS.
-# Collect test names from the line matching /^TESTS = \\$$/ to the following
-# one that does not end in '\'.
-_v = TESTS
-_w = root_tests
-vc_exe_in_TESTS: Makefile
- $(AM_V_GEN)if test -d $(top_srcdir)/.git && test $(srcdir) = .; then \
- { \
- for list in $(_v) $(_w); do \
- sed -n "/^$$list =[ ]*\\\\$$/,/[^\]$$/p" Makefile.am | \
- sed -n 's/^ *\([^$$ ]\{1,\}\).*/\1/p'; \
- done; \
- for f in `cd $(top_srcdir) && \
- build-aux/vc-list-files $(subdir) | sed 's!^$(subdir)/!!'`; do \
- test -f "$$f" && test -x "$$f" && echo "$$f"; \
- done; \
- } | sort | uniq -u | grep . && exit 1 ||:; \
- else :; fi
-
-check: vc_exe_in_TESTS
-.PHONY: vc_exe_in_TESTS
-
-CLEANFILES =
-CLEANFILES += .built-programs
-check_DATA = .built-programs
-.built-programs: $(top_srcdir)/src/Makefile.am
- $(AM_V_GEN)(cd $(top_builddir)/src \
- && MAKEFLAGS= $(MAKE) -s built_programs.list) \
- > $@-t && mv $@-t $@
-
-## '$f' is set by the Automake-generated test harness to the path of the
-## current test script stripped of VPATH components, and is used by the
-## shell-or-perl script to determine the name of the temporary files to be
-## used. Note that $f is a shell variable, not a make macro, so the use of
-## '$$f' below is correct, and not a typo.
-LOG_COMPILER = \
- $(SHELL) $(srcdir)/shell-or-perl \
- --test-name "$$f" --srcdir '$(srcdir)' \
- --shell '$(SHELL)' --perl '$(PERL)' --
-
-# Note that the first lines are statements. They ensure that environment
-# variables that can perturb tests are unset or set to expected values.
-# The rest are envvar settings that propagate build-related Makefile
-# variables to test scripts.
-TESTS_ENVIRONMENT = \
- . $(srcdir)/lang-default; \
- tmp__=$${TMPDIR-/tmp}; \
- test -d "$$tmp__" && test -w "$$tmp__" || tmp__=.; \
- . $(srcdir)/envvar-check; \
- TMPDIR=$$tmp__; export TMPDIR; \
- export \
- VERSION='$(VERSION)' \
- LOCALE_FR='$(LOCALE_FR)' \
- LOCALE_FR_UTF8='$(LOCALE_FR_UTF8)' \
- abs_top_builddir='$(abs_top_builddir)' \
- abs_top_srcdir='$(abs_top_srcdir)' \
- abs_srcdir='$(abs_srcdir)' \
- built_programs="`cat .built-programs`" \
- host_os=$(host_os) \
- host_triplet='$(host_triplet)' \
- srcdir='$(srcdir)' \
- top_srcdir='$(top_srcdir)' \
- CONFIG_HEADER='$(abs_top_builddir)/$(CONFIG_INCLUDE)' \
- CU_TEST_NAME=`basename '$(abs_srcdir)'`,`echo $$tst|sed 's,^\./,,;s,/,-,g'` \
- CC='$(CC)' \
- AWK='$(AWK)' \
- EGREP='$(EGREP)' \
- EXEEXT='$(EXEEXT)' \
- MAKE=$(MAKE) \
- PACKAGE_BUGREPORT='$(PACKAGE_BUGREPORT)' \
- PACKAGE_VERSION=$(PACKAGE_VERSION) \
- PERL='$(PERL)' \
- PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \
- ; test -d /usr/xpg4/bin && PATH='/usr/xpg4/bin$(PATH_SEPARATOR)'"$$PATH"; \
- PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \
- ; 9>&2
-
-VERBOSE = yes
--
1.7.12