[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-827-gbfebbd1

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=bfebbd11f941b2a6c78014d64333a9c3453f62cd

The branch, testsuite-work has been updated
       via  bfebbd11f941b2a6c78014d64333a9c3453f62cd (commit)
       via  2733c3b4bdd553e0fac6ae53dc64ab84cfc908a8 (commit)
      from  9dcc72a3121457bad5c01f29bb8ed96a3df34a3c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bfebbd11f941b2a6c78014d64333a9c3453f62cd
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 4 11:58:21 2011 +0200

    tests: 'silent-many-gcc.test' improved and made more robust
    
    * tests/silent-many-gcc.test:  Also force "fast" gcc depmode
    for C++ compilations.  Add sanity checks verifying that the
    cache variables we force are really used by configure.  Fix
    typo in comments.

commit 2733c3b4bdd553e0fac6ae53dc64ab84cfc908a8
Author: Stefano Lattarini <address@hidden>
Date:   Wed May 4 11:48:19 2011 +0200

    tests: drop useless requirements of 'g++'
    
    * tests/lflags2.test ($required): Remove 'g++', as any working
    C++ compiler should be enough, and ./configure will cause the
    test to skip if no working C++ compiler is found.
    * tests/yflags2.test: Likewise.
    * tests/subobj9.test: Likewise.
    * tests/silentcxx.test: Likewise.  Also, do not force depmodes
    that could cause non-GNU C++ compilers to fail.
    * tests/silentcxx-gcc.test: New test, like `silentcxx.test',
    but forcing "fast" gcc depmode (and thus requiring the GNU C++
    compiler).
    * tests/specflg10.test: Add proper "fixme" comment telling that
    we should make this test work with a generic C++ compiler.
    * tests/Makefile.am (TESTS): Update.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                    |   25 +++++++++++++++++++++++++
 tests/Makefile.am                            |    1 +
 tests/Makefile.in                            |    1 +
 tests/lflags2.test                           |    1 -
 tests/silent-many-gcc.test                   |   11 +++++++++--
 tests/{silentcxx.test => silentcxx-gcc.test} |   17 +++++++++++------
 tests/silentcxx.test                         |   18 ++++++++++++------
 tests/specflg10.test                         |    2 +-
 tests/subobj9.test                           |    2 +-
 tests/yflags2.test                           |    1 -
 10 files changed, 61 insertions(+), 18 deletions(-)
 copy tests/{silentcxx.test => silentcxx-gcc.test} (81%)

diff --git a/ChangeLog b/ChangeLog
index eda448e..6ab07c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       tests: 'silent-many-gcc.test' improved and made more robust
+       * tests/silent-many-gcc.test:  Also force "fast" gcc depmode
+       for C++ compilations.  Add sanity checks verifying that the
+       cache variables we force are really used by configure.  Fix
+       typo in comments.
+
+2011-05-04  Stefano Lattarini  <address@hidden>
+
+       tests: drop useless requirements of 'g++'
+       * tests/lflags2.test ($required): Remove 'g++', as any working
+       C++ compiler should be enough, and ./configure will cause the
+       test to skip if no working C++ compiler is found.
+       * tests/yflags2.test: Likewise.
+       * tests/subobj9.test: Likewise.
+       * tests/silentcxx.test: Likewise.  Also, do not force depmodes
+       that could cause non-GNU C++ compilers to fail.
+       * tests/silentcxx-gcc.test: New test, like `silentcxx.test',
+       but forcing "fast" gcc depmode (and thus requiring the GNU C++
+       compiler).
+       * tests/specflg10.test: Add proper "fixme" comment telling that
+       we should make this test work with a generic C++ compiler.
+       * tests/Makefile.am (TESTS): Update.
+
 2011-05-03  Stefano Lattarini  <address@hidden>
 
        tests defs: one more environment sanitization (corner case)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f51fb2c..2055211 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -864,6 +864,7 @@ silent7.test \
 silent8.test \
 silent9.test \
 silentcxx.test \
+silentcxx-gcc.test \
 silentf77.test \
 silentf90.test \
 silent-many-gcc.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index fd98415..e672e90 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1125,6 +1125,7 @@ silent7.test \
 silent8.test \
 silent9.test \
 silentcxx.test \
+silentcxx-gcc.test \
 silentf77.test \
 silentf90.test \
 silent-many-gcc.test \
diff --git a/tests/lflags2.test b/tests/lflags2.test
index 9e339f3..6c73121 100755
--- a/tests/lflags2.test
+++ b/tests/lflags2.test
@@ -19,7 +19,6 @@
 # Please keep this in sync with the sister tests lflags.test, yflags.test
 # and yflags2.test
 
-required=g++ # FIXME: any working C++ compiler should be OK
 . ./defs || Exit 1
 
 cat >fake-lex <<'END'
diff --git a/tests/silent-many-gcc.test b/tests/silent-many-gcc.test
index 62dafa1..79fa4a6 100755
--- a/tests/silent-many-gcc.test
+++ b/tests/silent-many-gcc.test
@@ -180,11 +180,18 @@ $ACLOCAL
 $AUTOMAKE --add-missing
 $AUTOCONF
 
+# Sanity check: make sure the cache variables we force are really
+# used by configure.
+$FGREP am_cv_CC_dependencies_compiler_type configure
+$FGREP am_cv_CXX_dependencies_compiler_type configure
+
 # Force gcc ("fast") depmode.
+depmodes="am_cv_CC_dependencies_compiler_type=gcc \
+          am_cv_CXX_dependencies_compiler_type=gcc"
 # This apparently useless "for" loop is here to simplify the syncing
-# with sister test `silent-many-gcc.test'.
+# with sister test `silent-many-generic.test'.
 for config_args in \
-  am_cv_CC_dependencies_compiler_type=gcc
+  "$depmodes"
 do
 
   ./configure $config_args --enable-silent-rules
diff --git a/tests/silentcxx.test b/tests/silentcxx-gcc.test
similarity index 81%
copy from tests/silentcxx.test
copy to tests/silentcxx-gcc.test
index 14d61ca..bc8beb9 100755
--- a/tests/silentcxx.test
+++ b/tests/silentcxx-gcc.test
@@ -15,8 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check silent-rules mode for C++.
+# This test requires the GNU C++ compiler; keep it in sync with sister
+# test `silentcxx.test', which should work with generic compilers.
 
-required='g++' # FIXME: any decent C++ compiler should be OK
 . ./defs || Exit 1
 
 mkdir sub
@@ -47,7 +48,7 @@ bar2_CXXFLAGS = $(AM_CXXFLAGS)
 EOF
 
 cat > foo.cpp <<'EOF'
-using namespace std; /* C compilers fail on this */
+using namespace std; /* C compilers fail on this. */
 int main() { return 0; }
 EOF
 
@@ -61,11 +62,15 @@ $ACLOCAL
 $AUTOMAKE --add-missing
 $AUTOCONF
 
-# configure once for fastdep, once for non-fastdep, once for nodep
+# Sanity check: make sure the cache variable we force is really used
+# by configure.
+$FGREP am_cv_CXX_dependencies_compiler_type configure
+
+# Force gcc ("fast") depmode.
+# This apparently useless "for" loop is here to simplify the syncing
+# with sister test `silentcxx.test'.
 for config_args in \
-  '' \
-  am_cv_CC_dependencies_compiler_type=gcc \
-  --disable-dependency-tracking
+  am_cv_CXX_dependencies_compiler_type=gcc \
 do
   ./configure $config_args --enable-silent-rules
   $MAKE >stdout || { cat stdout; Exit 1; }
diff --git a/tests/silentcxx.test b/tests/silentcxx.test
index 14d61ca..b4919c7 100755
--- a/tests/silentcxx.test
+++ b/tests/silentcxx.test
@@ -15,8 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check silent-rules mode for C++.
+# This test should work with generic C++ compilers; keep it in sync with
+# sister test `silentcxx-gcc.test', which requires the GNU C++ compiler
+# and forces the use of gcc depmode.
 
-required='g++' # FIXME: any decent C++ compiler should be OK
 . ./defs || Exit 1
 
 mkdir sub
@@ -47,7 +49,7 @@ bar2_CXXFLAGS = $(AM_CXXFLAGS)
 EOF
 
 cat > foo.cpp <<'EOF'
-using namespace std; /* C compilers fail on this */
+using namespace std; /* C compilers fail on this. */
 int main() { return 0; }
 EOF
 
@@ -61,11 +63,15 @@ $ACLOCAL
 $AUTOMAKE --add-missing
 $AUTOCONF
 
-# configure once for fastdep, once for non-fastdep, once for nodep
+# Sanity check: make sure the cache variable we force is really used
+# by configure.
+$FGREP am_cv_CXX_dependencies_compiler_type configure
+
+# Force dependency tracking explicitly, so that slow dependency
+# extractors are not rejected.  Try also with dependency tracking
+# explicitly disabled.
 for config_args in \
-  '' \
-  am_cv_CC_dependencies_compiler_type=gcc \
-  --disable-dependency-tracking
+  --enable-dependency-tracking --disable-dependency-tracking
 do
   ./configure $config_args --enable-silent-rules
   $MAKE >stdout || { cat stdout; Exit 1; }
diff --git a/tests/specflg10.test b/tests/specflg10.test
index 45753b2..3a05716 100755
--- a/tests/specflg10.test
+++ b/tests/specflg10.test
@@ -16,7 +16,7 @@
 
 # AM_DEFAULT_SOURCE_EXT
 
-required=g++
+required=g++ #FIXME: a generic C++ compiler should be enough.
 . ./defs || Exit 1
 
 cat >> configure.in << 'END'
diff --git a/tests/subobj9.test b/tests/subobj9.test
index fb81d70..f0e9007 100755
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -17,7 +17,7 @@
 
 # Test for PR 312.
 
-required='libtoolize g++'
+required=libtoolize
 . ./defs || Exit 1
 
 cat > configure.in << END
diff --git a/tests/yflags2.test b/tests/yflags2.test
index fe0d4b3..803cecc 100755
--- a/tests/yflags2.test
+++ b/tests/yflags2.test
@@ -19,7 +19,6 @@
 # Please keep this in sync with the sister tests yflags.test, lflags.test
 # and lflags2.test
 
-required=g++ # FIXME: any working C++ compiler should be OK
 . ./defs || Exit 1
 
 cat >fake-yacc <<'END'


hooks/post-receive
-- 
GNU Automake