* tests/specflags4.test, tests/specflags5.test: Remove, merged

into...
* tests/specflags3.test: here.

diff --git a/ChangeLog b/ChangeLog
index 8514e74968879295ae4c8bd23ef50f773e37e294..acba648ccb1f768c658aad13a31416715c66730d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2001-04-27  Akim Demaille  <akim@epita.fr>
+
+       * tests/specflags4.test, tests/specflags5.test: Remove, merged
+       into...
+       * tests/specflags3.test: here.
+
 2001-04-27  Akim Demaille  <akim@epita.fr>
 
        * automake.in ($seen_path_xtra): Remove.
        (&handle_compile): Don't handle `AC_PATH_XTRA' AC_SUBST variables.
        (&scan_one_autoconf_file): Do it, instead of setting $seen_path_xtra.
 
-       
 2001-04-27  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&file_contents_internal): Declare it.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4fd89fde93189a825a350b9d3501c9c4351abfd5..04769a0480bb41998f1262372156ba8bc7fb2c24 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -229,8 +229,6 @@ space.test \
 specflags.test \
 specflags2.test        \
 specflags3.test        \
-specflags4.test \
-specflags5.test \
 spell.test \
 spell2.test \
 spell3.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 05a787ff72706128acc1bf44f895d0270b716c4b..40f908569dcf06006ec292b4a7b1559e8afa9ed2 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -302,8 +302,6 @@ space.test \
 specflags.test \
 specflags2.test        \
 specflags3.test        \
-specflags4.test \
-specflags5.test \
 spell.test \
 spell2.test \
 spell3.test \

diff --git a/tests/specflags3.test b/tests/specflags3.test
index 8489e7f01a9ffb3ed7ed2685b4c5c05a2d197388..f6cdd116e589882117c118bb8059ae1381467068 100755 (executable)
--- a/tests/specflags3.test
+++ b/tests/specflags3.test
@@ -4,14 +4,18 @@
 
 . $srcdir/defs || exit 1
 
-cat >> configure.in << 'END'
+cat > configure.in << 'END'
+AC_INIT
+AM_INIT_AUTOMAKE(test, 0.1)
 AC_PROG_CC
+AC_OUTPUT(Makefile)
 END
 
 cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS = foo
 foo_SOURCES = foo.c
-foo_CFLAGS = -DBAR
+foo_CFLAGS = -DFOO
 END
 
 : > compile
@@ -19,4 +23,11 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-grep -e '-o foo-foo' Makefile.in
+fgrep -e '-o foo-foo' Makefile.in || exit 1
+
+fgrep 'foo.o.o' Makefile.in                       && exit 1
+fgrep 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in       && exit 1
+
+fgrep '$(foo_CFLAGS)' Makefile.in || exit 1
+
+exit 0

diff --git a/tests/specflags4.test b/tests/specflags4.test
deleted file mode 100755 (executable)
index c6de58d..0000000
--- a/tests/specflags4.test
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-
-# Another per-object test.  From Pavel Roskin.
-
-. $srcdir/defs || exit 1
-
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(test, 0.1)
-AC_PROG_CC
-AC_OUTPUT(Makefile)
-END
-
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = foreign
-bin_PROGRAMS = test1
-test1_SOURCES = test1.c
-test1_CFLAGS = -DXM12
-END
-
-: > compile
-
-$ACLOCAL || exit 1
-$AUTOMAKE || exit 1
-
-fgrep 'test1.o.o' Makefile.in && exit 1
-
-exit 0

diff --git a/tests/specflags5.test b/tests/specflags5.test
deleted file mode 100755 (executable)
index fb26924..0000000
--- a/tests/specflags5.test
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-
-# Test of flags specific to executable.
-# From Pavel Roskin.
-
-. $srcdir/defs || exit 1
-
-cat >> configure.in << 'END'
-AC_PROG_CC
-END
-
-cat > Makefile.am << 'END'
-bin_PROGRAMS = foo
-foo_CFLAGS = -DFOO
-foo_SOURCES = foo.c
-END
-
-: > compile
-
-$ACLOCAL || exit 1
-$AUTOMAKE || exit 1
-
-fgrep '$(foo_CFLAGS)' Makefile.in