[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-403-gbbfe77b

[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=bbfe77bf4eb6bfbc30f5a02b10f9c5494471803f

The branch, master has been updated
       via  bbfe77bf4eb6bfbc30f5a02b10f9c5494471803f (commit)
       via  c371d52f338cd511361e27347af7ff7678ecabc8 (commit)
       via  adba8e96113e4883ec568babd14709538fc696c6 (commit)
       via  b30c520ee85b91dd8a5afa5296b83e0ec578c53e (commit)
       via  a70b489a1f96539ce2d19b27f899ad74c04f500f (commit)
       via  521dda8c24be40219aaff2611ec30c8501494389 (commit)
       via  95f2b76562c4358589c9527a622b905d024cad1d (commit)
       via  e1482fda4a5702348a5cfe726c9ea8af476450ad (commit)
      from  e1181261dfd80b3046f1219e8fcfbb99707288f5 (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 bbfe77bf4eb6bfbc30f5a02b10f9c5494471803f
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 5 00:03:10 2010 +0100

    Fix ChangeLog after merge

commit c371d52f338cd511361e27347af7ff7678ecabc8
Merge: e118126 adba8e9
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 5 00:00:21 2010 +0100

    Merge branch 'tests-init'
    
    Conflicts:
        tests/ar-lib.test

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

Summary of changes:
 ChangeLog           |   43 ++++++++++++++++++++++++++
 tests/Makefile.am   |    6 ++--
 tests/Makefile.in   |    6 ++--
 tests/aclocal.test  |    2 +-
 tests/ar-lib.test   |    3 +-
 tests/auxdir.test   |    5 ++-
 tests/compile.test  |    4 +-
 tests/compile2.test |    2 +-
 tests/compile3.test |    2 +-
 tests/compile5.test |    2 +-
 tests/defs.in       |   83 +++++++++++++++++++++------------------------------
 tests/mdate6.test   |    2 +-
 tests/mkinst3.test  |    2 +-
 tests/multlib.test  |    4 +-
 tests/obsolete.test |    2 +-
 tests/txinfo22.test |    5 ++-
 16 files changed, 102 insertions(+), 71 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d0a145..010872d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -394,6 +394,49 @@
        Posix 2008 requires make to set errexit.
        * lib/am/check.am: Update comment.
 
+2010-09-06  Stefano Lattarini  <address@hidden>
+
+       Tests defs: remove variable $testaclocaldir.
+       * tests/defs.in ($testaclocaldir): Removed.
+       * tests/aclocal.test: Use `$top_testsrcdir/m4' directly, not
+       `$testaclocaldir'.
+
+       Tests defs: $srcdir and $top_srcdir renaming.
+       * tests/defs.in ($srcdir): Remove, define $testsrcdir directly.
+       * tests/Makefile.am ($(parallel_tests)): Generation of derived
+       tests updated.
+
+       Tests defs: new variable $top_testsrcdir.
+       * tests/defs.in ($top_testsrcdir): Define unconditionally
+       to @address@hidden  Use it throughout.
+       * tests/ar-lib.test: Use `$top_testsrcdir' instead of
+       `$testsrcdir/..'.
+       * tests/auxdir.test: Likewise.
+       * tests/compile.test: Likewise.
+       * tests/compile2.test: Likewise.
+       * tests/compile3.test: Likewise.
+       * tests/compile5.test: Likewise.
+       * tests/mdate6.test: Likewise.
+       * tests/mkinst3.test: Likewise.
+       * tests/multlib.test: Likewise.
+       * tests/txinfo22.test: Likewise.
+
+       Tests defs: $srcdir is unconditionally substituted.
+       * tests/defs.in ($srcdir): Define unconditionally to @address@hidden
+       Remove code for $srcdir normalization, which is now useless.
+
+2010-09-02  Stefano Lattarini  <address@hidden>
+
+       Tests defs: make spacing more consistent.
+       * tests/defs.in: Make spacing more consistent in indentation.
+       Especially, indent using only spaces, not tabs.  Also, move
+       a comment to a better position.
+
+       Improve code for requiring libtool and gettext in tests.
+       * tests/defs.in: Stricter (and more correct) detection of wheter
+       libtool, libtoolize and/or gettext are in $required.
+
+
 2010-08-27  Stefano Lattarini  <address@hidden>
 
        Fix bug in test missing6.test.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b25865b..70e14ae 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -38,10 +38,10 @@ $(parallel_tests): Makefile.am
        { echo '#!/bin/sh'; \
          echo '# DO NOT EDIT!  GENERATED AUTOMATICALLY!'; \
          echo; \
-         echo '# Ensure proper definition of $$srcdir.'; \
+         echo '# Ensure proper definition of $$testsrcdir.'; \
          echo 'am_skip_defs=yes'; \
          echo '. ./defs || exit 99'; \
-         echo 'test -n "$$srcdir" || exit 99 # sanity check'; \
+         echo 'test -n "$$testsrcdir" || exit 99 # sanity check'; \
          echo; \
          echo "# Run the test with Automake's parallel-tests driver enabled."; 
\
          echo 'parallel_tests=yes'; \
@@ -50,7 +50,7 @@ $(parallel_tests): Makefile.am
          echo "if test -f \"./$$input\"; then"; \
          echo "  . \"./$$input\""; \
          echo 'else'; \
-         echo "  . \"\$$srcdir/$$input\""; \
+         echo "  . \"\$$testsrcdir/$$input\""; \
          echo 'fi'; \
        } > address@hidden
        $(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 18f825b..99ce19e 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1485,10 +1485,10 @@ $(parallel_tests): Makefile.am
        { echo '#!/bin/sh'; \
          echo '# DO NOT EDIT!  GENERATED AUTOMATICALLY!'; \
          echo; \
-         echo '# Ensure proper definition of $$srcdir.'; \
+         echo '# Ensure proper definition of $$testsrcdir.'; \
          echo 'am_skip_defs=yes'; \
          echo '. ./defs || exit 99'; \
-         echo 'test -n "$$srcdir" || exit 99 # sanity check'; \
+         echo 'test -n "$$testsrcdir" || exit 99 # sanity check'; \
          echo; \
          echo "# Run the test with Automake's parallel-tests driver enabled."; 
\
          echo 'parallel_tests=yes'; \
@@ -1497,7 +1497,7 @@ $(parallel_tests): Makefile.am
          echo "if test -f \"./$$input\"; then"; \
          echo "  . \"./$$input\""; \
          echo 'else'; \
-         echo "  . \"\$$srcdir/$$input\""; \
+         echo "  . \"\$$testsrcdir/$$input\""; \
          echo 'fi'; \
        } > address@hidden
        $(AM_V_at)chmod a+rx address@hidden && mv -f address@hidden $@
diff --git a/tests/aclocal.test b/tests/aclocal.test
index da80d08..3e78df9 100755
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -41,6 +41,6 @@ grep '[Tt]ry.*--help.*for more information' stderr
 
 $ACLOCAL --versi
 
-test "`$ACLOCAL --print-ac-dir`" = "$testaclocaldir"
+test x"`$ACLOCAL --print-ac-dir`" = x"$top_testsrcdir/m4"
 
 :
diff --git a/tests/ar-lib.test b/tests/ar-lib.test
index 31d87ed..c788778 100755
--- a/tests/ar-lib.test
+++ b/tests/ar-lib.test
@@ -20,7 +20,8 @@
 
 set -e
 
-cp "$testsrcdir/../lib/ar-lib" .
+cp "$top_testsrcdir/lib/ar-lib" .
+
 # Use a dummy lib, since lib isn't readily available on all systems.
 cat >lib <<'END'
 #! /bin/sh
diff --git a/tests/auxdir.test b/tests/auxdir.test
index 95a7a20..74f6e6c 100755
--- a/tests/auxdir.test
+++ b/tests/auxdir.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2003, 2004, 2007  Free Software Foundation, 
Inc.
+# Copyright (C) 1996, 2001, 2002, 2003, 2004, 2007, 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
@@ -30,7 +31,7 @@ cat > Makefile.am << 'END'
 pkgdata_DATA =
 END
 
-cp "$testsrcdir/../lib/mkinstalldirs" .
+cp "$top_testsrcdir/lib/mkinstalldirs" .
 
 # The "././" prefix confuses Automake into thinking it is doing a
 # subdir build.  Yes, this is hacky.
diff --git a/tests/compile.test b/tests/compile.test
index ef27afe..6162861 100755
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2007, 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
@@ -20,7 +20,7 @@
 
 set -e
 
-cp "$testsrcdir/../lib/compile" .
+cp "$top_testsrcdir/lib/compile" .
 
 # -o 'a  c' should not be stripped because 'a  c' is not an object
 # (it does not matter whether touch creates ./-- or not)
diff --git a/tests/compile2.test b/tests/compile2.test
index 334f154..2f812c5 100755
--- a/tests/compile2.test
+++ b/tests/compile2.test
@@ -20,7 +20,7 @@
 
 set -e
 
-cp "$testsrcdir/../lib/compile" .
+cp "$top_testsrcdir/lib/compile" .
 
 cat >mycc <<'END'
 source_seen=no
diff --git a/tests/compile3.test b/tests/compile3.test
index e376800..d8c7d3b 100755
--- a/tests/compile3.test
+++ b/tests/compile3.test
@@ -20,7 +20,7 @@
 
 set -e
 
-cp "$testsrcdir/../lib/compile" .
+cp "$top_testsrcdir/lib/compile" .
 
 # Use a dummy cl, since cl isn't readily available on all systems
 cat >cl <<'END'
diff --git a/tests/compile5.test b/tests/compile5.test
index cd1468f..5fc1b30 100755
--- a/tests/compile5.test
+++ b/tests/compile5.test
@@ -21,7 +21,7 @@
 
 set -e
 
-cp "$testsrcdir/../lib/compile" .
+cp "$top_testsrcdir/lib/compile" .
 
 # Use a dummy cl, since cl isn't readily available on all systems
 cat >cl <<'END'
diff --git a/tests/defs.in b/tests/defs.in
index 31eb5a1..fe67b0f 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -21,7 +21,8 @@
 # Tom Tromey <address@hidden>
 
 # Absolutely necessary variable(s).
-srcdir=${srcdir-'@abs_srcdir@'}
+testsrcdir='@abs_srcdir@'
+top_testsrcdir='@abs_top_srcdir@'
 
 # Protect this file against multiple inclusion, useful for generated tests.
 if test x"$am_skip_defs" = xyes; then
@@ -49,9 +50,9 @@ test -f ./defs || {
    exit 1
 }
 
-# Ensure $srcdir is set correctly.
-test -f "$srcdir/defs.in" || {
-   echo "$srcdir/defs.in not found, check \$srcdir" 1>&2
+# Ensure $testsrcdir is set correctly.
+test -f "$testsrcdir/defs.in" || {
+   echo "$testsrcdir/defs.in not found, check \$testsrcdir" 1>&2
    exit 1
 }
 
@@ -69,7 +70,7 @@ test -z "$MAKE" && MAKE=make
 test -z "$AUTOCONF" && AUTOCONF="@am_AUTOCONF@"
 test -z "$AUTOHEADER" && AUTOHEADER="@am_AUTOHEADER@"
 test -z "$AUTOUPDATE" && AUTOUPDATE=autoupdate
-test -z "$MISSING" && MISSING=`pwd`/../lib/missing
+test -z "$MISSING" && MISSING=$top_testsrcdir/lib/missing
 # Use -Werror because this also turns some Perl warnings into error.
 # (Tests for which this is inappropriate should use -Wno-error.)
 test -z "$ACLOCAL" && ACLOCAL="aclocal-$APIVERSION -Werror"
@@ -205,11 +206,11 @@ do
     rst2html)
       # Try the variants that are tried in check.am.
       while :; do
-       for r2h in $RST2HTML rst2html rst2html.py; do
-         echo "$me: running $r2h --version"
-         $r2h --version && break 2
-       done
-       exit 77
+        for r2h in $RST2HTML rst2html rst2html.py; do
+          echo "$me: running $r2h --version"
+          $r2h --version && break 2
+        done
+        exit 77
       done
       ;;
     runtest)
@@ -229,26 +230,14 @@ do
       echo "$me: running texi2dvi -o /dev/null --version"
       ( texi2dvi -o /dev/null --version ) || exit 77
       ;;
-    # Generic case: the tool must support --version.
     *)
+      # Generic case: the tool must support --version.
       echo "$me: running $tool --version"
       ( $tool --version ) || exit 77
       ;;
   esac
 done
 
-
-# Always use an absolute srcdir.  Otherwise symlinks made in subdirs
-# of the test dir just won't work.
-case "$srcdir" in
- [\\/]* | ?:[\\/]*)
-    ;;
-
- *)
-    srcdir=`CDPATH=: && cd "$srcdir" && pwd`
-    ;;
-esac
-
 # We use a trap below for cleanup.  This requires us to go through
 # hoops to get the right exit status transported through the signal.
 # So use `Exit STATUS' instead of `exit STATUS' inside of the tests.
@@ -293,7 +282,7 @@ signal=0
 
 # Copy in some files we need.
 for file in install-sh missing depcomp; do
-   cp "$srcdir/../lib/$file" "$testSubDir/$file" || Exit 1
+   cp "$top_testsrcdir/lib/$file" "$testSubDir/$file" || Exit 1
 done
 
 cd ./$testSubDir
@@ -326,6 +315,9 @@ unset DESTDIR
 unset prefix exec_prefix bindir datarootdir datadir docdir dvidir
 unset htmldir includedir infodir libdir libexecdir localedir mandir
 unset oldincludedir pdfdir psdir sbindir sharedstatedir sysconfdir
+# The tests call `make -e' but we do not want $srcdir from the environment
+# to override the definition from the Makefile.
+unset srcdir
 # Also unset variables that control our test driver.  While not
 # conceptually independent, they cause some changed semantics we
 # need to control (and test for) in some of the tests to ensure
@@ -341,13 +333,13 @@ echo "=== Running test $0"
 
 # We might need extra macros, e.g., from Libtool or Gettext.
 # Find them on the system.
-# Use `-I $srcdir/../m4' in addition to `--acdir=$srcdir/../m4', because the
-# other `-I' directories added for libtool and gettext might contain
-# files from an old version of Automake that we don't want to use.
+# Use `-I $top_testsrcdir/m4' in addition to `--acdir=$top_testsrcdir/m4',
+# because the other `-I' directories added for libtool and gettext might
+# contain files from an old version of Automake that we don't want to use.
 # Use `-Wno-syntax' because we do not want our test suite to fail because
 # some third-party .m4 file is underquoted.
-case $required in
-  *libtool* | *gettext* )
+case " $required " in
+  *' libtool '* | *' libtoolize '* | *' gettext '* )
     aclocaldir='@prefix@/share/aclocal'
     extra_includes=""
     if test -f $aclocaldir/dirlist; then
@@ -360,30 +352,28 @@ case $required in
     libtool_found=no
     gettext_found=no
     for d in $extra_includes $aclocaldir ; do
-       test "x$d" != x-I || continue
-       if test -f "$d/libtool.m4"; then
-         libtool_found=yes
-       fi
-       if test -f "$d/gettext.m4"; then
-         gettext_found=yes
-       fi
+      test "x$d" != x-I || continue
+      if test -f "$d/libtool.m4"; then
+        libtool_found=yes
+      fi
+      if test -f "$d/gettext.m4"; then
+        gettext_found=yes
+      fi
     done
-    case $required in
-      *libtool* ) test $libtool_found = yes || Exit 77 ;;
-      *gettext* ) test $gettext_found = yes || Exit 77 ;;
+    case " $required " in
+      *' libtool '* | *' libtoolize '* ) test $libtool_found = yes || Exit 77;;
+      *' gettext '* ) test $gettext_found = yes || Exit 77;;
     esac
     # Libtool cannot cope with spaces in the build tree.  Our testsuite setup
     # cannot cope with spaces in the source tree name for Libtool and gettext
     # tests.
-    case $srcdir,`pwd` in
-      *\ * | *\        *) Exit 77 ;;
+    case $testsrcdir,`pwd` in
+      *\ * | *\        *) Exit 77;;
     esac
-    ACLOCAL="$ACLOCAL -Wno-syntax -I $srcdir/../m4 $extra_includes -I 
$aclocaldir"
+    ACLOCAL="$ACLOCAL -Wno-syntax -I $top_testsrcdir/m4 $extra_includes -I 
$aclocaldir"
     ;;
 esac
 
-testaclocaldir='@abs_top_srcdir@/m4'
-
 # POSIX no longer requires 'egrep' and 'fgrep',
 # but some hosts lack 'grep -E' and 'grep -F'.
 EGREP='@EGREP@'
@@ -394,11 +384,6 @@ FGREP='@FGREP@'
 # and can be up to 3 seconds in the future w.r.t. the system clock.
 sleep='sleep @MODIFICATION_DELAY@'
 
-# The tests call `make -e' but we do not want $srcdir from the environment
-# to override the definition from the Makefile.
-testsrcdir=$srcdir
-unset srcdir
-
 # An old timestamp that can be given to a file, in "touch -t" format.
 # The time stamp should be portable to all file systems of interest.
 # Just for fun, choose the exact time of the announcement of the GNU project
diff --git a/tests/mdate6.test b/tests/mdate6.test
index e7f7d69..cb2456c 100755
--- a/tests/mdate6.test
+++ b/tests/mdate6.test
@@ -24,7 +24,7 @@ a=
 file='file  name $a'
 ( : > "$file" ) || Exit 77
 
-cp "$testsrcdir"/../lib/mdate-sh .
+cp "$top_testsrcdir/lib/mdate-sh" .
 $SHELL ./mdate-sh "$file" >stdout 2>stderr ||
   { cat stdout; cat stderr >&2; Exit 1; }
 cat stdout
diff --git a/tests/mkinst3.test b/tests/mkinst3.test
index 20b9b04..da999d3 100755
--- a/tests/mkinst3.test
+++ b/tests/mkinst3.test
@@ -25,7 +25,7 @@ mkdir '~a b' || Exit 77
 mkdir '~a b/-x  y' || Exit 77
 rm -rf '~a b'
 
-cp "$testsrcdir/../lib/mkinstalldirs" .
+cp "$top_testsrcdir/lib/mkinstalldirs" .
 
 # Test mkinstalldirs with the installed mkdir.
 
diff --git a/tests/multlib.test b/tests/multlib.test
index 3f88be3..c4b0024 100755
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -107,8 +107,8 @@ mkdir libbar/sub
 
 : > libbar/bar.c
 
-cp "$testsrcdir/../lib/config-ml.in" .
-cp "$testsrcdir/../lib/symlink-tree" .
+cp "$top_testsrcdir/lib/config-ml.in" .
+cp "$top_testsrcdir/lib/symlink-tree" .
 
 $ACLOCAL
 $AUTOCONF
diff --git a/tests/obsolete.test b/tests/obsolete.test
index 337e4db..588fc0d 100755
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -28,7 +28,7 @@ AC_INIT
 END
 
 $PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \
-    "$testsrcdir/../m4/obsolete.m4" >> obs
+    "$top_testsrcdir/m4/obsolete.m4" >> obs
 cat obs >> configure.in
 $PERL -ne 'chomp; print "grep $_ stderr || Exit 1\n"; ' obs > obs.1
 $PERL -ne 'chomp; print "grep $_ configure.in && Exit 1\n"; ' obs > obs.2
diff --git a/tests/txinfo22.test b/tests/txinfo22.test
index 3c2265d..4adf473 100755
--- a/tests/txinfo22.test
+++ b/tests/txinfo22.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2007, 2008, 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
@@ -56,7 +57,7 @@ END
 
 mkdir aux1
 mkdir tex
-cp "$testsrcdir/../lib/texinfo.tex" tex
+cp "$top_testsrcdir/lib/texinfo.tex" tex
 
 $ACLOCAL
 $AUTOMAKE --add-missing


hooks/post-receive
-- 
GNU Automake