[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-756-g531cc87

[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=531cc8718179f1bb738d5d1baafdcdfd419b0db3

The branch, master has been updated
       via  531cc8718179f1bb738d5d1baafdcdfd419b0db3 (commit)
       via  d66a7c60468a4f098b3248e9a467a278c6c65198 (commit)
      from  08ebcd3a83e37fc1522a11bd906e6c802b022468 (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 531cc8718179f1bb738d5d1baafdcdfd419b0db3
Merge: 08ebcd3 d66a7c6
Author: Stefano Lattarini <address@hidden>
Date:   Tue Apr 12 17:25:42 2011 +0200

    Merge branch 'maint' (with edits)
    
    test defs: define default $distdir (help reducing duplication)
    
    * tests/defs ($distdir): New variable, might be used in
    testcases checking distribution-related features.
    * tests/pr9.test: Use it.
    * tests/subdir9.test: Likewise.
    * tests/lex3.test: Likewise.
    * tests/lexvpath.test: Likewise.
    * tests/remake-moved-m4-file.test: Likewise.
    * tests/remake-renamed-m4-file.test: Likewise.
    * tests/remake-renamed-m4-macro-and-file.test: Likewise.
    * tests/yacc-basic.test: Likewise.
    * tests/yacc-d-basic.test: Likewise.
    * tests/yacc-d-vpath.test: Likewise.
    * tests/yacc-dist-nobuild.test: Likewise.
    * tests/vtexi3.test: Add comment explaining why we redefine
    $distdir in this test.

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

Summary of changes:
 ChangeLog                                   |   19 +++++++++++++++++++
 tests/defs                                  |    4 ++++
 tests/lex3.test                             |    2 --
 tests/lexvpath.test                         |    2 --
 tests/pr9.test                              |    2 --
 tests/remake-moved-m4-file.test             |    2 --
 tests/remake-renamed-m4-file.test           |    2 --
 tests/remake-renamed-m4-macro-and-file.test |    2 --
 tests/subdir9.test                          |    2 --
 tests/vtexi3.test                           |    2 ++
 tests/yacc-basic.test                       |    2 --
 tests/yacc-d-basic.test                     |    1 -
 tests/yacc-d-vpath.test                     |    2 --
 tests/yacc-dist-nobuild.test                |    2 --
 14 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 338b567..afeac95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2011-04-12  Stefano Lattarini  <address@hidden>
+
+       test defs: define default $distdir (help reducing duplication)
+       * tests/defs ($distdir): New variable, might be used in
+       testcases checking distribution-related features.
+       * tests/pr9.test: Use it.
+       * tests/subdir9.test: Likewise.
+       * tests/lex3.test: Likewise.
+       * tests/lexvpath.test: Likewise.
+       * tests/remake-moved-m4-file.test: Likewise.
+       * tests/remake-renamed-m4-file.test: Likewise.
+       * tests/remake-renamed-m4-macro-and-file.test: Likewise.
+       * tests/yacc-basic.test: Likewise.
+       * tests/yacc-d-basic.test: Likewise.
+       * tests/yacc-d-vpath.test: Likewise.
+       * tests/yacc-dist-nobuild.test: Likewise.
+       * tests/vtexi3.test: Add comment explaining why we redefine
+       $distdir in this test.
+
 2011-04-11  Stefano Lattarini  <address@hidden>
 
        depcomp: fix bugs in tests and in the depcomp script
diff --git a/tests/defs b/tests/defs
index a36f718..f67491a 100644
--- a/tests/defs
+++ b/tests/defs
@@ -501,6 +501,10 @@ esac
 ##  Set up of the exit trap for cleanup of said directory.          ##
 ## ---------------------------------------------------------------- ##
 
+# This might be used in testcases checking distribution-related features.
+# Test scripts are free to override this if they need to.
+distdir=$me-1.0
+
 # The subdirectory where the current test script will run and write its
 # temporary/data files.  This will be created shortly, and will be removed
 # by the cleanup trap below if the test passes.  If the test doesn't pass,
diff --git a/tests/lex3.test b/tests/lex3.test
index bc88399..f702864 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -26,8 +26,6 @@ required='gcc flex GNUmake'
 CFLAGS=
 export CFLAGS
 
-distdir=$me-1.0
-
 cat >> configure.in << 'END'
 AC_PROG_CC
 AM_PROG_LEX
diff --git a/tests/lexvpath.test b/tests/lexvpath.test
index 876541a..300a476 100755
--- a/tests/lexvpath.test
+++ b/tests/lexvpath.test
@@ -25,8 +25,6 @@
 required='gcc flex'
 . ./defs || Exit 1
 
-distdir=$me-1.0
-
 cat > lexoutroot.in << 'END'
 LEX_OUTPUT_ROOT='@LEX_OUTPUT_ROOT@'
 END
diff --git a/tests/pr9.test b/tests/pr9.test
index 4a9a47e..71a535a 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -46,8 +46,6 @@ $AUTOMAKE -a -c
 $MAKE
 $MAKE distcheck
 
-distdir=$me-1.0
-
 gzip -d $distdir.tar.gz
 
 tar tf $distdir.tar | $FGREP support
diff --git a/tests/remake-moved-m4-file.test b/tests/remake-moved-m4-file.test
index 55b0bce..4af4fdd 100755
--- a/tests/remake-moved-m4-file.test
+++ b/tests/remake-moved-m4-file.test
@@ -19,8 +19,6 @@
 
 . ./defs || Exit 1
 
-distdir=$me-1.0
-
 cat >> configure.in <<'END'
 MY_MACRO
 AC_OUTPUT
diff --git a/tests/remake-renamed-m4-file.test 
b/tests/remake-renamed-m4-file.test
index b2ebd79..3378fab 100755
--- a/tests/remake-renamed-m4-file.test
+++ b/tests/remake-renamed-m4-file.test
@@ -18,8 +18,6 @@
 
 . ./defs || Exit 1
 
-distdir=$me-1.0
-
 cat >> configure.in <<'END'
 MY_MACRO
 AC_OUTPUT
diff --git a/tests/remake-renamed-m4-macro-and-file.test 
b/tests/remake-renamed-m4-macro-and-file.test
index 370c1ce..beedb58 100755
--- a/tests/remake-renamed-m4-macro-and-file.test
+++ b/tests/remake-renamed-m4-macro-and-file.test
@@ -20,8 +20,6 @@
 
 . ./defs || Exit 1
 
-distdir=$me-1.0
-
 cat >> configure.in <<'END'
 MY_MACRO
 AC_OUTPUT
diff --git a/tests/subdir9.test b/tests/subdir9.test
index 55e9608..dd7799f 100755
--- a/tests/subdir9.test
+++ b/tests/subdir9.test
@@ -41,8 +41,6 @@ cat >src/subdir2/Makefile.am <<'EOF'
 EXTRA_DIST = foo
 EOF
 
-distdir=$me-1.0
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --copy --add-missing
diff --git a/tests/vtexi3.test b/tests/vtexi3.test
index 83e6482..04fb7d7 100755
--- a/tests/vtexi3.test
+++ b/tests/vtexi3.test
@@ -22,6 +22,8 @@
 
 . ./defs || Exit 1
 
+# We are going to override package version in AC_INIT, so we need
+# to redefine the name of the distdir as well.
 distdir=$me-7.45.3a
 
 # This should work without tex, texinfo or makeinfo
diff --git a/tests/yacc-basic.test b/tests/yacc-basic.test
index 26dc4a9..351b409 100755
--- a/tests/yacc-basic.test
+++ b/tests/yacc-basic.test
@@ -19,8 +19,6 @@
 required=yacc
 . ./defs || Exit 1
 
-distdir=$me-1.0
-
 cat >> configure.in << 'END'
 AC_PROG_CC
 AC_PROG_YACC
diff --git a/tests/yacc-d-basic.test b/tests/yacc-d-basic.test
index ae60084..015c44c 100755
--- a/tests/yacc-d-basic.test
+++ b/tests/yacc-d-basic.test
@@ -21,7 +21,6 @@ required=yacc
 . ./defs || Exit 1
 
 tab='  '
-distdir=$me-1.0
 
 cat >> configure.in << 'END'
 AC_PROG_CC
diff --git a/tests/yacc-d-vpath.test b/tests/yacc-d-vpath.test
index b331bf5..401998e 100755
--- a/tests/yacc-d-vpath.test
+++ b/tests/yacc-d-vpath.test
@@ -25,8 +25,6 @@
 required=yacc
 . ./defs || Exit 1
 
-distdir=$me-1.0
-
 cat >> configure.in << 'END'
 AC_PROG_CC
 AC_PROG_YACC
diff --git a/tests/yacc-dist-nobuild.test b/tests/yacc-dist-nobuild.test
index 85a960d..7961a5f 100755
--- a/tests/yacc-dist-nobuild.test
+++ b/tests/yacc-dist-nobuild.test
@@ -20,8 +20,6 @@
 required=yacc
 . ./defs || Exit 1
 
-distdir=$me-1.0
-
 cat >> configure.in << 'END'
 AC_PROG_CC
 AC_PROG_YACC


hooks/post-receive
-- 
GNU Automake