[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.3-878-g681f327

[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=681f32756796f6a90c97213452a757843cc001b8

The branch, ng/master has been updated
       via  681f32756796f6a90c97213452a757843cc001b8 (commit)
       via  b0f4556918deaf2efa42a298c27f42195e909815 (commit)
       via  ad20eab7d4a27f027971c0bd77a09ccedf7730d8 (commit)
       via  5a289480393e6ed0679be099dd2117c20ba2946f (commit)
       via  0610fc8ebe02125d556bd81b6a78c3306efd25e2 (commit)
       via  26b78559eef83ee5535564c782680f33fd9899f5 (commit)
       via  d8f47b194d55dfb31a116106032eaf81bdf5656e (commit)
       via  078ff407c4b50309c65c7c8eb61d6b08f4d2577e (commit)
       via  df23dafc30d54164035281aec1f6ce14d0f4b0fc (commit)
      from  7468fab75ba53a5f9fdf67bd1ced0d2cc54841a2 (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 681f32756796f6a90c97213452a757843cc001b8
Merge: ad20eab b0f4556
Author: Stefano Lattarini <address@hidden>
Date:   Sat Oct 27 14:29:19 2012 +0200

    Merge branch 'master' into ng/master
    
    * master:
      tests: prepare to move ./defs to t/ax/test-init.sh

commit ad20eab7d4a27f027971c0bd77a09ccedf7730d8
Merge: 7468fab 5a28948
Author: Stefano Lattarini <address@hidden>
Date:   Sat Oct 27 14:15:05 2012 +0200

    Merge branch 'am-prog-mkdir-p-remove' into ng/master
    
    Since we had to restate AM_PROG_MKDIR_P in master before the 1.13
    release, we don't merge master directly in ng/master, to avoid spurious
    merge conflicts (since AM_PROG_MKDIR_P should remain obsolete and
    removed in Automake-NG).
    
    We have thus create a temporary branch 'am-prog-mkdir-p-remove', based
    off of master, which reverts the commit 'v1.12.4-158-gdf23daf', which
    reinstated AM_PROG_MKDIR_P, and are merging that branch in 'ng/master'.
    
    Once 1.13 is out and master becomes the starting point of Automake 1.14,
    we'll merge the 'am-prog-mkdir-p-remove' branch back into master as well,
    since we plan to remove AM_PROG_MKDIR_P once and for all in Automake 1.14.
    
    * am-prog-mkdir-p-remove:
      AM_PROG_MKDIR_P: remove as obsolete, this time for good
      depcomp: avoid potential interferences from the environment
      depcomp: improve comments about the 'gcc' depmode
      compat: reinstate AM_PROG_MKDIR_P, for gettext
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 Makefile.am               |    1 +
 defs                      |   13 +++++--------
 gen-testsuite-part        |    7 +++++--
 lib/depcomp               |    9 ++++++++-
 t/README                  |   21 +++++++++++----------
 t/ac-output-old.tap       |    2 +-
 defs => t/ax/test-init.sh |    0
 t/c-demo.sh               |    2 +-
 8 files changed, 32 insertions(+), 23 deletions(-)
 copy defs => t/ax/test-init.sh (100%)

diff --git a/Makefile.am b/Makefile.am
index f727843..813eb5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -409,6 +409,7 @@ nodist_noinst_SCRIPTS = \
   t/wrap/automake-$(APIVERSION)
 
 dist_noinst_DATA = \
+  t/ax/test-init.sh \
   t/ax/test-lib.sh \
   t/ax/am-test-lib.sh \
   t/ax/tap-functions.sh
diff --git a/defs b/defs
index 1ee1116..586181e 100644
--- a/defs
+++ b/defs
@@ -14,12 +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/>.
+#
+# This file is here for backward-compatibility with the existing
+# tests still unconverted to the use of 'test-init.sh'.  It should
+# eventually be removed, once all the tests have been converted.
 
-set -e
-
-# Source the actual code for test initialization and setup.
-. test-lib.sh
-. am-test-lib.sh
-
-# Run that setup, and return control to the test script sourcing us.
-am_test_setup
+. test-init.sh
diff --git a/gen-testsuite-part b/gen-testsuite-part
index 0e862ac..f5f5db6 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -340,8 +340,11 @@ my %depmodes =
     makedepend   => ["cc", "makedepend"],
     dashmstdout  => ["gcc"],
     cpp          => ["gcc"],
-# This is for older (pre-3.x) GCC versions.  Newer versions
-# have depmode "gcc3".
+# This was for older (pre-3.x) GCC versions (newer versions
+# have depmode "gcc3").  But other compilers use this depmode
+# as well (for example, the IMB xlc/xlC compilers, and the HP
+# C compiler, see 'lib/depcomp' for more info), so it's not
+# obsolete, and it's worth giving it some coverage.
     gcc          => ["gcc"],
 # This is for older (pre-7) msvc versions.  Newer versions
 # have depmodes "msvc7" and "msvc7msys".
diff --git a/lib/depcomp b/lib/depcomp
index 9f8ae75..b2d2367 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -73,6 +73,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 
's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -141,13 +144,17 @@ gcc3)
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
diff --git a/t/README b/t/README
index ee063b4..b4e1490 100644
--- a/t/README
+++ b/t/README
@@ -146,8 +146,8 @@ Writing test cases
   tools which can be taken for granted because they're listed in the
   GNU Coding Standards (for example, 'gzip').
 
-* Include ./defs in every test script (see existing tests for examples
-  of how to do this).
+* Include 'test-init.sh' in every test script (see existing tests for
+  examples of how to do this).
 
 * Use the 'skip_' function to skip tests, with a meaningful message if
   possible.  Where convenient, use the 'warn_' function to print generic
@@ -166,7 +166,7 @@ Writing test cases
   parallel one.  For those tests that are *not* meant to work with the
   parallel testsuite harness at all (these should be very very few),
   set the shell variable 'am_serial_tests' to "yes" before including
-  ./defs.
+  test-init.sh.
 
 * Some tests in the Automake-NG testsuite are auto-generated; those
   tests might have custom extensions, but their basename (that is,
@@ -177,14 +177,15 @@ Writing test cases
   to be confused with auto-generated tests; for example, 'u-v-w.sh' or
   'option-w0.tap' are *not* valid name for hand-written tests.
 
-* ./defs brings in some commonly required files, and sets a skeleton
-  configure.ac.  If possible, append to this file.  In some cases
-  you'll have to overwrite it, but this should be the exception.  Note
-  that configure.ac registers Makefile.in but do not output anything by
+* test-init.sh brings in some commonly required files, and sets a skeleton
+  configure.ac.  If possible, append to this file.  In some cases you'll
+  have to overwrite it, but this should be the exception.  Note that
+  configure.ac registers Makefile.in but do not output anything by
   default.  If you need ./configure to create Makefile, append AC_OUTPUT
-  to configure.ac.  In case you don't want ./defs to pre-populate your
-  test directory (which is a rare occurrence), set the 'am_create_testdir'
-  shell variable to "empty" before sourcing ./defs.
+  to configure.ac.  In case you don't want your test directory to be
+  pre-populate by test-init.sh (this should be a rare occurrence), set
+  the 'am_create_testdir' shell variable to "empty" before sourcing
+  test-init.sh.
 
 * By default, the testcases are run with the errexit shell flag on,
   to make it easier to catch failures you might not have thought of.
diff --git a/t/ac-output-old.tap b/t/ac-output-old.tap
index 2039674..a19691a 100755
--- a/t/ac-output-old.tap
+++ b/t/ac-output-old.tap
@@ -18,7 +18,7 @@
 # line breaking in the use of AC_OUTPUT.  Synthesised by a bunch
 # of older tests (referenced below).
 
-. ./defs || exit 1
+. test-init.sh
 
 plan_ 22
 
diff --git a/defs b/t/ax/test-init.sh
similarity index 100%
copy from defs
copy to t/ax/test-init.sh
diff --git a/t/c-demo.sh b/t/c-demo.sh
index 2f51cf7..b0d1c47 100755
--- a/t/c-demo.sh
+++ b/t/c-demo.sh
@@ -19,7 +19,7 @@
 
 required=cc
 am_create_testdir=empty
-. ./defs || exit 1
+. test-init.sh
 
 cat > configure.ac << 'END'
 AC_INIT([GNU C Demo], [22.3.2], address@hidden)


hooks/post-receive
-- 
GNU Automake