From 8a5096d150cf9803b8963768b7366cd68edcce03 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 6 Apr 2012 13:12:25 +0200 Subject: tests: rename 'tests/' => 't/', '*.test' => '*.sh' When we (soon) convert the Automake testsuite to a non-recursive make setup, we'll have to fix the entries of $(TESTS) to be prepended with the subdirectory they are in; this will increase the length of $(TESTS), and thus increase the possibility of exceeding the command-line length limits on some systems (most notably, MinGW/MSYS). See automake bug#7868 for more information. Thus we rename the 'tests/' subdirectory to 't/', and each 'x.test' script in there to 'x.sh'; this way, the $(TESTS) entry 'foo.test' will become 't/foo.sh', which have the same number of characters. * tests/: Rename ... * t/: ... to this. * t/*.test: Rename ... * t/*.sh: ... to this. * t/.gitignore: Removed as obsolete. * t/defs: Adjust. * t/gen-testsuite-part: Likewise. * t/list-of-tests.mk: Likewise. * t/ccnoco.sh: Likewise. * t/ccnoco3.sh: Likewise. * t/self-check-cleanup.tap: Likewise. * t/self-check-dir.tap: Likewise. * t/self-check-me.tap: Likewise. * t/self-check-reexec.tap: Likewise. * README: Likewise. * bootstrap: Likewise * configure.ac: Likewise. * Makefile.am: Likewise. * .gitignore: Likewise. * syntax-check.mk: Likewise. Signed-off-by: Stefano Lattarini --- t/cond34.sh | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100755 t/cond34.sh (limited to 't/cond34.sh') diff --git a/t/cond34.sh b/t/cond34.sh new file mode 100755 index 000000000..8349406a2 --- /dev/null +++ b/t/cond34.sh @@ -0,0 +1,75 @@ +#!/bin/sh +# Copyright (C) 2004-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 . + +# Check for _DEPENDENCIES definition with conditional _LDADD. +# Report from Elena A. Vengerova. + +. ./defs || Exit 1 + +cat >>configure.ac <<'EOF' +AM_CONDITIONAL([TWO], [test -n "$two"]) +AC_OUTPUT +EOF + +cat > Makefile.am <<'EOF' +OBJEXT=z +CC=false +AUTOMAKE_OPTIONS=no-dependencies + +bin_PROGRAMS = test1 test2 + +if TWO + test1_LDADD = two.$(OBJEXT) + test2_LDADD = two.$(OBJEXT) + test2_DEPENDENCIES = $(test2_LDADD) somethingelse.a +else !TWO + test1_LDADD = one.$(OBJEXT) + test2_LDADD = three.$(OBJEXT) +endif !TWO + +test1_DEPENDENCIES = $(test1_LDADD) somethingelse.a + +.PHONY: dep-test1 dep-test2 +dep-test1: + echo BEG: $(test1_DEPENDENCIES) :END +dep-test2: + echo BEG: $(test2_DEPENDENCIES) :END +EOF + +$ACLOCAL +$AUTOCONF +$AUTOMAKE +./configure + +$MAKE dep-test1 >stdout || { cat stdout; Exit 1; } +cat stdout +$FGREP 'BEG: one.z somethingelse.a :END' stdout + +$MAKE dep-test2 >stdout || { cat stdout; Exit 1; } +cat stdout +$FGREP 'BEG: three.z :END' stdout + +./configure two=2 + +$MAKE dep-test1 >stdout || { cat stdout; Exit 1; } +cat stdout +$FGREP 'BEG: two.z somethingelse.a :END' stdout + +$MAKE dep-test2 >stdout || { cat stdout; Exit 1; } +cat stdout +$FGREP 'BEG: two.z somethingelse.a :END' stdout + +: -- cgit v1.2.1