[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-338-gd66a7c6

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

The branch, maint has been updated
       via  d66a7c60468a4f098b3248e9a467a278c6c65198 (commit)
      from  ac6764da0c0ad499e51a36db0a818b03b697ef37 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |   10 ++++++++++
 tests/defs.in      |    4 ++++
 tests/pr9.test     |    2 --
 tests/subdir9.test |    2 --
 tests/vtexi3.test  |    2 ++
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 20862ea..8a144af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-12  Stefano Lattarini  <address@hidden>
+
+       test defs: define default $distdir (help reducing duplication)
+       * tests/defs.in ($distdir): New variable, might be used in
+       testcases checking distribution-related features.
+       * tests/pr9.test: Use it.
+       * tests/subdir9.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.in b/tests/defs.in
index 8aaf108..cf07a4e 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -66,6 +66,10 @@ test -f "$srcdir/defs.in" || {
 
 me=`echo "$0" | sed -e 's,.*[\\/],,;s/\.test$//'`
 
+# 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
+
 APIVERSION='@APIVERSION@'
 PATH_SEPARATOR='@PATH_SEPARATOR@'
 
diff --git a/tests/pr9.test b/tests/pr9.test
index a2e71d7..1f27f69 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -47,8 +47,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/subdir9.test b/tests/subdir9.test
index c73ca18..403a376 100755
--- a/tests/subdir9.test
+++ b/tests/subdir9.test
@@ -43,8 +43,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 34f46c5..4b0f45d 100755
--- a/tests/vtexi3.test
+++ b/tests/vtexi3.test
@@ -24,6 +24,8 @@
 
 set -e
 
+# 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


hooks/post-receive
-- 
GNU Automake