From d7d983b0276e903b492054d99cbbd6918279cb6a Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 2 Jul 2012 17:24:24 +0200 Subject: [PATCH] tests: tests for stuff in contrib goes in 'contrib/t' * t/help-multilib.sh: Move ... * contrib/t/help-multilib.sh: .. here. Remove a now-obsolete "FIXME" comment. * t/multlib.sh: Move ... * contrib/t/multilib.sh: .. here. Remove a now-obsolete "FIXME" comment. * t/parallel-test2.sh: Move ... * contrib/t/parallel-tests-html.sh: .. here. Remove a now-obsolete "FIXME" comment. * contrib/t/local.am: New, basically defining the list of tests for stuff in 'contrib/'. * t/list-of-tests.mk, Makefile.am: Adjust. * .gitignore: Update. * syntax-checks.mk (xtests): Likewise. Signed-off-by: Stefano Lattarini --- .gitignore | 3 +++ Makefile.am | 5 +++++ {t => contrib/t}/help-multilib.sh | 2 -- contrib/t/local.am | 24 ++++++++++++++++++++++ t/multlib.sh => contrib/t/multilib.sh | 2 -- .../t/parallel-tests-html.sh | 2 -- syntax-checks.mk | 2 +- t/list-of-tests.mk | 3 --- 8 files changed, 33 insertions(+), 10 deletions(-) rename {t => contrib/t}/help-multilib.sh (89%) create mode 100644 contrib/t/local.am rename t/multlib.sh => contrib/t/multilib.sh (96%) rename t/parallel-tests2.sh => contrib/t/parallel-tests-html.sh (96%) diff --git a/.gitignore b/.gitignore index df004ba..eae55ce 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,9 @@ /t/*.dir /t/*.log /t/*.trs +/contrib/t/*.dir +/contrib/t/*.log +/contrib/t/*.trs /t/pm/*.log /t/pm/*.trs /t/perf/*.log diff --git a/Makefile.am b/Makefile.am index 860e7ac..f05e82d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -379,6 +379,11 @@ EXTRA_DIST += gen-testsuite-part $(generated_TESTS): $(srcdir)/gen-testsuite-part $(srcdir)/t/testsuite-part.am: $(srcdir)/gen-testsuite-part Makefile.am +# Hand-written tests for stuff in 'contrib/'. +include $(srcdir)/contrib/t/local.am +TESTS += $(contrib_TESTS) +EXTRA_DIST += $(contrib_TESTS) + # Static dependencies valid for each test case. check_SCRIPTS = t/wrap/aclocal-$(APIVERSION) t/wrap/automake-$(APIVERSION) dist_check_DATA = \ diff --git a/t/help-multilib.sh b/contrib/t/help-multilib.sh similarity index 89% rename from t/help-multilib.sh rename to contrib/t/help-multilib.sh index d4f6402..3e89bbe 100755 --- a/t/help-multilib.sh +++ b/contrib/t/help-multilib.sh @@ -16,8 +16,6 @@ # Make sure that our macro 'AM_ENABLE_MULTILIB' adds proper text to # the configure help screen. -# FIXME: the features tested by this script has been moved in contrib. -# FIXME: We should move this script accordingly. . ./defs || exit 1 diff --git a/contrib/t/local.am b/contrib/t/local.am new file mode 100644 index 0000000..0a5f5c1 --- /dev/null +++ b/contrib/t/local.am @@ -0,0 +1,24 @@ +# Copyright (C) 1995-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 2, 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 . + +# Automake: tests for stuff in 'contrib/'. + +## Relative to the top-level directory. +contrib_testsuite_dir = contrib/t + +contrib_TESTS = \ + $(contrib_testsuite_dir)/parallel-tests-html.sh \ + $(contrib_testsuite_dir)/help-multilib.sh \ + $(contrib_testsuite_dir)/multilib.sh diff --git a/t/multlib.sh b/contrib/t/multilib.sh similarity index 96% rename from t/multlib.sh rename to contrib/t/multilib.sh index 778db14..fef1ec2 100755 --- a/t/multlib.sh +++ b/contrib/t/multilib.sh @@ -16,8 +16,6 @@ # Check multilib support. # Based on a test case from Ralf Corsepius. -# FIXME: the features tested by this script has been moved in contrib. -# FIXME: We should move this script accordingly. required='gcc GNUmake' . ./defs || exit 1 diff --git a/t/parallel-tests2.sh b/contrib/t/parallel-tests-html.sh similarity index 96% rename from t/parallel-tests2.sh rename to contrib/t/parallel-tests-html.sh index ae9bd38..e7abc66 100755 --- a/t/parallel-tests2.sh +++ b/contrib/t/parallel-tests-html.sh @@ -17,8 +17,6 @@ # Check parallel-tests features: # - check-html # - recheck-html -# FIXME: the features tested by this script has been moved in contrib. -# FIXME: We should move this script accordingly. . ./defs || exit 1 diff --git a/syntax-checks.mk b/syntax-checks.mk index 052547c..6ebaf69 100644 --- a/syntax-checks.mk +++ b/syntax-checks.mk @@ -27,7 +27,7 @@ xtests := $(shell \ fi; \ for d in $$dirs; do \ for s in tap sh; do \ - ls $$d/t/*.$$s $$d/t/ax/*.$$s 2>/dev/null; \ + ls $$d/t/ax/*.$$s $$d/t/*.$$s $$d/contrib/t/*.$$s 2>/dev/null; \ done; \ done | sort) diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 7b0bd97..08919da 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -487,7 +487,6 @@ t/help-depend2.sh \ t/help-dmalloc.sh \ t/help-init.sh \ t/help-lispdir.sh \ -t/help-multilib.sh \ t/help-python.sh \ t/help-silent.sh \ t/help-upc.sh \ @@ -676,7 +675,6 @@ t/mkinst2.sh \ t/mkinst3.sh \ t/mmode.sh \ t/mmodely.sh \ -t/multlib.sh \ t/no-extra-makefile-code.sh \ t/no-outdir-option.sh \ t/nobase.sh \ @@ -731,7 +729,6 @@ t/parallel-am2.sh \ t/parallel-am3.sh \ t/serial-tests.sh \ t/parallel-tests.sh \ -t/parallel-tests2.sh \ t/parallel-tests3.sh \ t/parallel-tests5.sh \ t/parallel-tests6.sh \ -- 2.7.4