From 8511c132d9de587daa107ef66b23398accdcb682 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 30 Apr 1997 01:10:36 +0000 Subject: [PATCH] added conditionals tests from ian --- tests/ChangeLog | 4 ++++ tests/Makefile.am | 2 +- tests/Makefile.in | 4 ++-- tests/cond.test | 24 ++++++++++++++++++++++++ tests/cond2.test | 25 +++++++++++++++++++++++++ 5 files changed, 56 insertions(+), 3 deletions(-) create mode 100755 tests/cond.test create mode 100755 tests/cond2.test diff --git a/tests/ChangeLog b/tests/ChangeLog index 16a66405a..3fe8a2fe9 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +Tue Apr 29 19:08:47 1997 Tom Tromey + + * cond.test, cond2.test: New files from Ian Taylor. + Sun Apr 27 21:07:49 1997 Tom Tromey * confsub.test: Fixed bug. diff --git a/tests/Makefile.am b/tests/Makefile.am index c985affe6..ead2577f4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -25,7 +25,7 @@ colon2.test colon3.test remake.test output.test output2.test \ remake2.test output3.test output4.test colneq2.test subst.test \ defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test \ cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test \ -ldadd.test version2.test conf2.test +ldadd.test version2.test conf2.test cond.test cond2.test EXTRA_DIST = defs $(TESTS) diff --git a/tests/Makefile.in b/tests/Makefile.in index bb57c7057..6d048d5f0 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1o from Makefile.am +# Makefile.in generated automatically by automake 1.1n from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -84,7 +84,7 @@ colon2.test colon3.test remake.test output.test output2.test \ remake2.test output3.test output4.test colneq2.test subst.test \ defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test \ cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test \ -ldadd.test version2.test conf2.test +ldadd.test version2.test conf2.test cond.test cond2.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/tests/cond.test b/tests/cond.test new file mode 100755 index 000000000..459b64b06 --- /dev/null +++ b/tests/cond.test @@ -0,0 +1,24 @@ +#! /bin/sh + +# Check basic use of conditionals. + +. $srcdir/defs || exit 1 + +cat > configure.in << 'END' +AM_INIT_AUTOMAKE(nonesuch, nonesuch) +AM_CONDITIONAL(TEST, true) +AC_OUTPUT(Makefile) +END + +cat > Makefile.am << 'END' +if TEST +VAR = true +else +VAR = false +endif +END + +$AUTOMAKE || exit 1 + +grep '^@TEST_TRUE@' Makefile.in || exit 1 +exit 0 diff --git a/tests/cond2.test b/tests/cond2.test new file mode 100755 index 000000000..8e4ee5b36 --- /dev/null +++ b/tests/cond2.test @@ -0,0 +1,25 @@ +#! /bin/sh + +# Check SUBDIRS set based on conditionals. + +. $srcdir/defs || exit 1 + +cat > configure.in << 'END' +AM_INIT_AUTOMAKE(nonesuch, nonesuch) +AM_CONDITIONAL(TEST, true) +AC_OUTPUT(Makefile) +END + +cat > Makefile.am << 'END' +if TEST +DIR = dir1 +else +DIR = dir2 +endif +SUBDIRS = $(DIR) +END + +mkdir dir1 + +$AUTOMAKE && exit 1 +exit 0 -- 2.47.3