[PATCH 08/14] Fixes/renamings for "synced tests" among `silent*.test'.

[Stefano Lattarini]

A cleanup patch w.r.t. names of tests `silent*.test', as the previous 
"naming scheme" (i.e. basically random) was becoming to be really 
confusing and unwieldy.

NOTE 1: All the new test names should still be DJGPP-safe.  A double
check would be appreciated, though.
NOTE 2: Git seems not to have displayed the usual smartness while 
formatting the patch, so the diffs are somewhat misleading.  Sorry 
about that, but I don't now how to fix it.

* tests/silent.test: Renamed to ...
* tests/silent1a.test: ... this.
* tests/silent2.test: Renamed to ...
* tests/silent1b.test: ... this, and edited to make it more in
sync with silent1a.test.
* tests/silent2b.test: Renamed to ...
* tests/silent1c.test: ... this, and edited to make it more in
sync with silent1a.test.
* tests/silent1d.test: New test, sister of silent1{a,b,c}.test,
but running explicitly without automatic dependency tracking.
* tests/silent3.test: Renamed to ...
* tests/silent2a.test: ... this, and updated comments.
* test/silent4.test: Rename to ...
* tests/silent2b.test: ... this, and updated comments.
* tests/silent4b.test: Renamed to ...
* tests/silent2c.test: ... this, and updated comments.
* tests/silent9.test: Rename to ...
* tests/silent2d.test: ... this, and updated comments.
* tests/Makefile.am (TESTS): Updated

Regards,
    Stefano

From a26e26f0b4bd3ecbadce029d4cb4e5c069afc9d1 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Fri, 2 Jul 2010 12:41:30 +0200
Subject: [PATCH 08/14] Fixes/renamings for "synced tests" among `silent*.test'.

NOTE: all the new test names should still be DJGPP-safe.

* tests/silent.test: Renamed to ...
* tests/silent1a.test: ... this.
* tests/silent2.test: Renamed to ...
* tests/silent1b.test: ... this, and edited to make it more in
sync with silent1a.test.
* tests/silent2b.test: Renamed to ...
* tests/silent1c.test: ... this, and edited to make it more in
sync with silent1a.test.
* tests/silent1d.test: New test, sister of silent1{a,b,c}.test,
but running explicitly without automatic dependency tracking.
* tests/silent3.test: Renamed to ...
* tests/silent2a.test: ... this, and updated comments.
* test/silent4.test: Rename to ...
* tests/silent2b.test: ... this, and updated comments.
* tests/silent4b.test: Renamed to ...
* tests/silent2c.test: ... this, and updated comments.
* tests/silent9.test: Rename to ...
* tests/silent2d.test: ... this, and updated comments.
* tests/Makefile.am (TESTS): Updated
---
 ChangeLog                              |   21 +++++++
 tests/Makefile.am                      |   13 +++--
 tests/Makefile.in                      |   13 +++--
 tests/{silent.test => silent1a.test}   |    3 +-
 tests/{silent2.test => silent1b.test}  |    6 +-
 tests/{silent.test => silent1c.test}   |   12 ++--
 tests/{silent.test => silent1d.test}   |    9 ++--
 tests/{silent3.test => silent2a.test}  |    3 +-
 tests/silent2b.test                    |   52 ++++++++++---------
 tests/{silent4b.test => silent2c.test} |    5 +-
 tests/{silent9.test => silent2d.test}  |    3 +-
 tests/silent4.test                     |   90 --------------------------------
 12 files changed, 81 insertions(+), 149 deletions(-)
 copy tests/{silent.test => silent1a.test} (96%)
 rename tests/{silent2.test => silent1b.test} (94%)
 copy tests/{silent.test => silent1c.test} (83%)
 rename tests/{silent.test => silent1d.test} (87%)
 rename tests/{silent3.test => silent2a.test} (96%)
 rename tests/{silent4b.test => silent2c.test} (94%)
 rename tests/{silent9.test => silent2d.test} (96%)
 delete mode 100755 tests/silent4.test

diff --git a/ChangeLog b/ChangeLog
index 7be360e..7aa5ad3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 2010-07-02  Stefano Lattarini  <address@hidden>
 
+       Fixes/renamings for "synced tests" among `silent*.test'.
+       * tests/silent.test: Renamed to ...
+       * tests/silent1a.test: ... this.
+       * tests/silent2.test: Renamed to ...
+       * tests/silent1b.test: ... this, and edited to make it more in
+       sync with silent1a.test.
+       * tests/silent2b.test: Renamed to ...
+       * tests/silent1c.test: ... this, and edited to make it more in
+       sync with silent1a.test.
+       * tests/silent1d.test: New test, sister of silent1{a,b,c}.test,
+       but running explicitly without automatic dependency tracking.
+       * tests/silent3.test: Renamed to ...
+       * tests/silent2a.test: ... this, and updated comments.
+       * test/silent4.test: Rename to ...
+       * tests/silent2b.test: ... this, and updated comments.
+       * tests/silent4b.test: Renamed to ...
+       * tests/silent2c.test: ... this, and updated comments.
+       * tests/silent9.test: Rename to ...
+       * tests/silent2d.test: ... this, and updated comments.
+       * tests/Makefile.am (TESTS): Updated.
+
        Make sure tests `silent*.test' work with non-GNU C compilers.
        * tests/silent2.test: Do not force configure to assume gcc-style
        depmode, instead try to force use of slow depmode if nothing
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7344522..5b8f7b7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -636,18 +636,19 @@ rulepat.test \
 sanity.test \
 scripts.test \
 seenc.test \
-silent.test \
-silent2.test \
+silent1a.test \
+silent1b.test \
+silent1c.test \
+silent1d.test \
+silent2a.test \
 silent2b.test \
-silent3.test \
-silent4.test \
-silent4b.test \
+silent2c.test \
+silent2d.test \
 silent5.test \
 silent5b.test \
 silent6.test \
 silent7.test \
 silent8.test \
-silent9.test \
 silentcxx.test \
 silentcxx2.test \
 silentf77.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2cc46ca..1c0fdd0 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -847,18 +847,19 @@ rulepat.test \
 sanity.test \
 scripts.test \
 seenc.test \
-silent.test \
-silent2.test \
+silent1a.test \
+silent1b.test \
+silent1c.test \
+silent1d.test \
+silent2a.test \
 silent2b.test \
-silent3.test \
-silent4.test \
-silent4b.test \
+silent2c.test \
+silent2d.test \
 silent5.test \
 silent5b.test \
 silent6.test \
 silent7.test \
 silent8.test \
-silent9.test \
 silentcxx.test \
 silentcxx2.test \
 silentf77.test \
diff --git a/tests/silent.test b/tests/silent1a.test
similarity index 96%
copy from tests/silent.test
copy to tests/silent1a.test
index 881e2d1..124158a 100755
--- a/tests/silent.test
+++ b/tests/silent1a.test
@@ -15,8 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check silent-rules mode, without libtool, standard depmode case.
-
-# Please keep this file in sync with silent2.test and silent2b.test.
+# Please keep this file in sync with other `silent1*.test' tests.
 
 required=cc
 . ./defs || Exit 1
diff --git a/tests/silent2.test b/tests/silent1b.test
similarity index 94%
rename from tests/silent2.test
rename to tests/silent1b.test
index 8b7f56e..9a882aa 100755
--- a/tests/silent2.test
+++ b/tests/silent1b.test
@@ -15,10 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check silent-rules mode, without libtool, non-fastdep case.
-# Please keep this file in sync with silent.test and silent2b.test.
+# Please keep this file in sync with other `silent1*.test' tests.
 
 required=cc
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
@@ -65,7 +65,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
 $EGREP ' (-c|-o)' stdout && Exit 1
 grep 'mv ' stdout && Exit 1
-grep 'CC .*foo\.' stdout
+grep 'CC    .*foo\.' stdout
 grep 'CC .*bar\.' stdout
 grep 'CC .*baz\.' stdout
 grep 'CC .*bla\.' stdout
diff --git a/tests/silent.test b/tests/silent1c.test
similarity index 83%
copy from tests/silent.test
copy to tests/silent1c.test
index 881e2d1..51c3006 100755
--- a/tests/silent.test
+++ b/tests/silent1c.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010 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
@@ -14,11 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check silent-rules mode, without libtool, standard depmode case.
+# Check silent-rules mode, without libtool, gcc-style non-fast depmode
+# (so that, with GCC, we also cover the other code paths in depend2).
+# Please keep this file in sync with other `silent1*.test' tests.
 
-# Please keep this file in sync with silent2.test and silent2b.test.
-
-required=cc
+required=gcc
 . ./defs || Exit 1
 
 set -e
@@ -61,7 +61,7 @@ $ACLOCAL
 $AUTOMAKE --add-missing
 $AUTOCONF
 
-./configure --enable-silent-rules
+./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
 $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
 $EGREP ' (-c|-o)' stdout && Exit 1
diff --git a/tests/silent.test b/tests/silent1d.test
similarity index 87%
rename from tests/silent.test
rename to tests/silent1d.test
index 881e2d1..8fd0aad 100755
--- a/tests/silent.test
+++ b/tests/silent1d.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010 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
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check silent-rules mode, without libtool, standard depmode case.
-
-# Please keep this file in sync with silent2.test and silent2b.test.
+# Check silent-rules mode, without libtool and dependecy tracking.
+# Please keep this file in sync with other `silent1*.test' tests.
 
 required=cc
 . ./defs || Exit 1
@@ -61,7 +60,7 @@ $ACLOCAL
 $AUTOMAKE --add-missing
 $AUTOCONF
 
-./configure --enable-silent-rules
+./configure --disable-dependency-tracking --enable-silent-rules
 $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
 $EGREP ' (-c|-o)' stdout && Exit 1
diff --git a/tests/silent3.test b/tests/silent2a.test
similarity index 96%
rename from tests/silent3.test
rename to tests/silent2a.test
index c7d2832..5b50a6c 100755
--- a/tests/silent3.test
+++ b/tests/silent2a.test
@@ -15,8 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check silent-rules mode, with libtool, standard depmode case.
-
-# Please keep this file in sync with sister tests silent{4,4b,9}.test.
+# Please keep this file in sync with other `silent2*.test' tests.
 
 required='cc libtoolize'
 . ./defs
diff --git a/tests/silent2b.test b/tests/silent2b.test
index d5430c9..7834a02 100755
--- a/tests/silent2b.test
+++ b/tests/silent2b.test
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010  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
@@ -14,11 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check silent-rules mode, without libtool, non-fastdep case
-# (so that, with GCC, we also cover the other code paths in depend2).
-# Please keep this file in sync with silent.test ans silent2.test.
+# Check silent-rules mode, with libtool, non-fastdep case
+# Please keep this file in sync with other `silent2*.test' tests.
 
-required=gcc
+required="libtoolize cc"
 . ./defs
 
 set -e
@@ -30,56 +29,61 @@ AM_SILENT_RULES
 AC_CONFIG_FILES([sub/Makefile])
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_PROG_LIBTOOL
 AC_OUTPUT
 EOF
 
 cat > Makefile.am <<'EOF'
 # Need generic and non-generic rules.
-bin_PROGRAMS = foo bar
-bar_CFLAGS = $(AM_CFLAGS)
+lib_LTLIBRARIES = libfoo.la libbar.la
+libbar_la_CFLAGS = $(AM_CFLAGS)
 SUBDIRS = sub
 EOF
 
 cat > sub/Makefile.am <<'EOF'
 AUTOMAKE_OPTIONS = subdir-objects
 # Need generic and non-generic rules.
-bin_PROGRAMS = baz bla
-bla_CFLAGS = $(AM_CFLAGS)
+lib_LTLIBRARIES = libbaz.la libbla.la
+libbla_la_CFLAGS = $(AM_CFLAGS)
 EOF
 
-cat > foo.c <<'EOF'
+cat > libfoo.c <<'EOF'
 int main ()
 {
   return 0;
 }
 EOF
-cp foo.c bar.c
-cp foo.c sub/baz.c
-cp foo.c sub/bla.c
+cp libfoo.c libbar.c
+cp libfoo.c sub/libbaz.c
+cp libfoo.c sub/libbla.c
 
+libtoolize
 $ACLOCAL
 $AUTOMAKE --add-missing
 $AUTOCONF
 
-./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
+./configure --enable-dependency-tracking --enable-silent-rules
 $MAKE >stdout || { cat stdout; Exit 1; }
 cat stdout
 $EGREP ' (-c|-o)' stdout && Exit 1
 grep 'mv ' stdout && Exit 1
-grep 'CC .*foo\.' stdout
-grep 'CC .*bar\.' stdout
-grep 'CC .*baz\.' stdout
-grep 'CC .*bla\.' stdout
-grep 'CCLD .*foo' stdout
-grep 'CCLD .*bar' stdout
-grep 'CCLD .*baz' stdout
-grep 'CCLD .*bla' stdout
+grep ' CC .*foo\.' stdout
+grep ' CC .*bar\.' stdout
+grep ' CC .*baz\.' stdout
+grep ' CC .*bla\.' stdout
+grep ' CCLD .*foo' stdout
+grep ' CCLD .*bar' stdout
+grep ' CCLD .*baz' stdout
+grep ' CCLD .*bla' stdout
 
 $MAKE clean
 $MAKE V=1 >stdout || { cat stdout; Exit 1; }
 cat stdout
 grep ' -c' stdout
-grep ' -o foo' stdout
-$EGREP '(CC|LD) ' stdout && Exit 1
+grep ' -o libfoo' stdout
+# The libtool command line can contain e.g. a `--tag=CC' option.
+sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
+
+$MAKE distclean
 
 :
diff --git a/tests/silent4b.test b/tests/silent2c.test
similarity index 94%
rename from tests/silent4b.test
rename to tests/silent2c.test
index f7b4e3b..c8113bf 100755
--- a/tests/silent4b.test
+++ b/tests/silent2c.test
@@ -14,10 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check silent-rules mode, with libtool, non-fastdep case
+# Check silent-rules mode, with libtool, gcc-style non-fast depmode
 # (so that, with GCC, we also cover the other code paths in depend2).
-
-# Please keep this file in sync with sister tests silent{3,4,9}.test.
+# Please keep this file in sync with other `silent2*.test' tests.
 
 required="libtoolize gcc"
 . ./defs
diff --git a/tests/silent9.test b/tests/silent2d.test
similarity index 96%
rename from tests/silent9.test
rename to tests/silent2d.test
index 1ce89a8..006ce55 100755
--- a/tests/silent9.test
+++ b/tests/silent2d.test
@@ -15,8 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check silent-rules mode, with libtool, nodep case.
-
-# Please keep this file in sync with sister tests silent{3,4,4b}.test.
+# Please keep this file in sync with other `silent2*.test' tests.
 
 required='cc libtoolize'
 . ./defs
diff --git a/tests/silent4.test b/tests/silent4.test
deleted file mode 100755
index bd08943..0000000
--- a/tests/silent4.test
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009, 2010  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 <http://www.gnu.org/licenses/>.
-
-# Check silent-rules mode, with libtool, non-fastdep case
-
-# Please keep this file in sync with siste tests silent{3,4b,9}.test.
-
-required="libtoolize cc"
-. ./defs
-
-set -e
-
-mkdir sub
-
-cat >>configure.in <<'EOF'
-AM_SILENT_RULES
-AC_CONFIG_FILES([sub/Makefile])
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-lib_LTLIBRARIES = libfoo.la libbar.la
-libbar_la_CFLAGS = $(AM_CFLAGS)
-SUBDIRS = sub
-EOF
-
-cat > sub/Makefile.am <<'EOF'
-AUTOMAKE_OPTIONS = subdir-objects
-# Need generic and non-generic rules.
-lib_LTLIBRARIES = libbaz.la libbla.la
-libbla_la_CFLAGS = $(AM_CFLAGS)
-EOF
-
-cat > libfoo.c <<'EOF'
-int main ()
-{
-  return 0;
-}
-EOF
-cp libfoo.c libbar.c
-cp libfoo.c sub/libbaz.c
-cp libfoo.c sub/libbla.c
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure --enable-dependency-tracking --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
-grep ' CC .*foo\.' stdout
-grep ' CC .*bar\.' stdout
-grep ' CC .*baz\.' stdout
-grep ' CC .*bla\.' stdout
-grep ' CCLD .*foo' stdout
-grep ' CCLD .*bar' stdout
-grep ' CCLD .*baz' stdout
-grep ' CCLD .*bla' stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o libfoo' stdout
-# The libtool command line can contain e.g. a `--tag=CC' option.
-sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
-
-$MAKE distclean
-
-:
-- 
1.6.5