* tests/stamph2.test: Strengthen.

* tests/confh2.test, tests/confh3.test: Remove.
These are bad tests: they don't check the effects, but some
internal details in Makefile.
And they are covered by stamph2.test.

diff --git a/ChangeLog b/ChangeLog
index e07e84956f39e9a5bf90c0b63f803286bcff12e3..8ae94cea1c9be1374cd2f7921cf67a9ef084a4d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-26  Akim Demaille  <akim@epita.fr>
+
+       * tests/stamph2.test: Strengthen.
+       * tests/confh2.test, tests/confh3.test: Remove.
+       These are bad tests: they don't check the effects, but some
+       internal details in Makefile.
+       And they are covered by stamph2.test.
+
 2001-10-26  Akim Demaille  <akim@epita.fr>
 
        Now that stamp-h's are created by config.status, we don't need to

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3ab0c6a7a7cae020c9c72b03d182e35d56f5c227..d452e94c3089b9be110fbb128ec8a77e805b2101 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -84,8 +84,6 @@ conf2.test \
 confdeps.test \
 confdist.test \
 confh.test \
-confh2.test \
-confh3.test \
 confh4.test \
 config.test \
 confincl.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4f328c72a5424a64fa975585cbd1e5e652326931..dd57a38fe4049938fc02e5974e910a47d9e91c6a 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -61,32 +61,16 @@ POST_UNINSTALL = :
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AWK = @AWK@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBS = @LIBS@
-MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
 PERL = @PERL@
-SET_MAKE = @SET_MAKE@
 VERSION = @VERSION@
-build_alias = @build_alias@
-host_alias = @host_alias@
+am__include = @am__include@
+am__quote = @am__quote@
 install_sh = @install_sh@
-program_transform_name = @program_transform_name@
-target_alias = @target_alias@
 
 XFAIL_TESTS = condd.test subdir5.test auxdir2.test cond17.test nobase.test
 
@@ -172,8 +156,6 @@ conf2.test \
 confdeps.test \
 confdist.test \
 confh.test \
-confh2.test \
-confh3.test \
 confh4.test \
 config.test \
 confincl.test \

diff --git a/tests/confh2.test b/tests/confh2.test
deleted file mode 100755 (executable)
index 97e12a3..0000000
--- a/tests/confh2.test
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-
-# Test to make sure stamp files created correctly.
-# Report from Erez Zadok.
-
-. $srcdir/defs || exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
-AM_CONFIG_HEADER(config.h:include/config.h.in)
-AC_OUTPUT(Makefile)
-END
-
-: > Makefile.am
-: > acconfig.h
-
-mkdir include
-: > include/config.h.in
-
-$ACLOCAL || exit 1
-$AUTOMAKE || exit 1
-
-grep '^config.h:' Makefile.in || exit 1
-fgrep 'echo timestamp > stamp-h' Makefile.in || exit 1
-fgrep '../include/config.h.in' Makefile.in && exit 1
-exit 0

diff --git a/tests/confh3.test b/tests/confh3.test
deleted file mode 100755 (executable)
index d804cc8..0000000
--- a/tests/confh3.test
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-# Another test to make sure stamp files created correctly.
-# Report from Erez Zadok.
-
-. $srcdir/defs || exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-PACKAGE=nonesuch
-VERSION=nonesuch
-AM_CONFIG_HEADER(d1/config.h:d2/config.h.in)
-AC_OUTPUT(Makefile d1/Makefile)
-END
-
-: > Makefile.am
-: > acconfig.h
-
-mkdir d1 d2
-
-: > d1/Makefile.am
-
-: > d2/config.h.in
-
-$ACLOCAL || exit 1
-$AUTOMAKE || exit 1
-
-grep '^config.h:' d1/Makefile.in || exit 1
-fgrep 'echo timestamp > stamp-h' d1/Makefile.in || exit 1
-fgrep '../d2/config.h.in' d1/Makefile.in || exit 1

diff --git a/tests/stamph2.test b/tests/stamph2.test
index 79536f288c2727f8a4d494d0b95438b3634f2cad..040f5f89cc5bb9d022ac36fc8d8bb1689c17d4bd 100755 (executable)
--- a/tests/stamph2.test
+++ b/tests/stamph2.test
@@ -1,29 +1,42 @@
 #! /bin/sh
 
 # Make sure stamp-h* files are created where we expect
-
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
 AC_INIT(Makefile.am)
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AM_CONFIG_HEADER(firstfile.h sdir/secondfile.h thirdfile.h)
+AM_CONFIG_HEADER(1.h
+                 2.h:config.hin
+                 3.h:sdir1/config1.hin
+
+                 sdir1/4.h
+                 sdir1/5.h:config.hin
+                 sdir1/6.h:sdir1/config1.hin
+                 sdir1/7.h:sdir2/config2.hin)
 AC_OUTPUT(Makefile)
 END
 
 : > Makefile.am
-mkdir sdir
-: > firstfile.h.in
-: > sdir/secondfile.h.in
-: > thirdfile.h.in
-
-# Fail gracefully if no autoconf.
-$needs_autoconf
+mkdir sdir1
+mkdir sdir2
+: > config.hin
+: > 1.h.in
+: > sdir1/4.h.in
+: > sdir1/config1.hin
+: > sdir2/config2.hin
 
 $ACLOCAL || exit 1
 $AUTOCONF || exit 1
 $AUTOMAKE || exit 1
 ./configure || exit 1
 
-(test -f stamp-h1 && test -f sdir/stamp-h2 && test -f stamp-h3) || exit 1
+test -f stamp-h1 || exit 1
+test -f stamp-h2 || exit 1
+test -f stamp-h3 || exit 1
+test -f sdir1/stamp-h4 || exit 1
+test -f sdir1/stamp-h5 || exit 1
+test -f sdir1/stamp-h6 || exit 1
+test -f sdir1/stamp-h7 || exit 1
+
 exit 0