From: Tom Tromey Date: Sat, 21 Jul 2001 22:46:14 +0000 (+0000) Subject: * tests/Makefile.am (TESTS): Added substtart.test. X-Git-Tag: Release-1-4j~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7638bd9f08dc48bb4eb64296e752c1f734851ecc;p=thirdparty%2Fautomake.git * tests/Makefile.am (TESTS): Added substtart.test. (XFAIL_TESTS): Likewise. * tests/substtarg.test: New file. --- diff --git a/ChangeLog b/ChangeLog index e5dab0320..f9a3ba430 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2001-07-21 Tom Tromey + * tests/Makefile.am (TESTS): Added substtart.test. + (XFAIL_TESTS): Likewise. + * tests/substtarg.test: New file. + * automake.in (handle_dist): Handle case where aux dir doesn't have a Makefile. Fixes depdist.test. * tests/Makefile.am (XFAIL_TESTS): Removed depdist.test. diff --git a/tests/Makefile.am b/tests/Makefile.am index 92ea1a1c0..097a4f278 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in -XFAIL_TESTS = subdir5.test +XFAIL_TESTS = subdir5.test substtarg.test TESTS = \ acinclude.test \ @@ -270,6 +270,7 @@ subobj6.test \ subobj7.test \ subobj8.test \ subst.test \ +substtarg.test \ suffix.test \ suffix2.test \ suffix3.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 5699c55f2..05edb274e 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -66,7 +66,7 @@ _am_include = @_am_include@ _am_quote = @_am_quote@ install_sh = @install_sh@ -XFAIL_TESTS = subdir5.test +XFAIL_TESTS = subdir5.test substtarg.test TESTS = \ acinclude.test \ @@ -336,6 +336,7 @@ subobj6.test \ subobj7.test \ subobj8.test \ subst.test \ +substtarg.test \ suffix.test \ suffix2.test \ suffix3.test \ diff --git a/tests/substtarg.test b/tests/substtarg.test new file mode 100755 index 000000000..ded02849a --- /dev/null +++ b/tests/substtarg.test @@ -0,0 +1,34 @@ +#! /bin/sh + +# Test that substitutions in variables work. +# From Lars J. Aas. + +. $srcdir/defs || exit 1 + +cat > configure.in << 'END' +AC_INIT(fakelib.c) +AM_INIT_AUTOMAKE(fakelib,0.0) +AC_PROG_CC +RANLIB=: +AC_SUBST(RANLIB) +SUBST=hei +AC_SUBST(SUBST) +AC_OUTPUT(Makefile) +END + +cat > Makefile.am << 'END' +noinst_LIBRARIES = libfake@SUBST@.a + +libfake@SUBST@_a_SOURCES = abra.c kadabra.c + +# then we override the target rule: +libfake@SUBST@.a: Makefile $(libfake@SUBST@_a_OBJECTS) $(libfake@SUBST@_a_DEPENDENCIES) + @echo here we do some custom stuff, instead of invoking the linker +END + +set -e + +$ACLOCAL +$AUTOMAKE +num=`grep '^libfake@SUBST@.a:' Makefile.in | wc -l` +test $num -eq 1