From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 12 Apr 2011 14:50:33 +0000 (+0200)
Subject: test defs: define default $distdir (help reducing duplication)
X-Git-Tag: ng-0.5a~210^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d66a7c60468a4f098b3248e9a467a278c6c65198;p=thirdparty%2Fautomake.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 20862eace..8a144af7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	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  <stefano.lattarini@gmail.com>
 
 	depcomp: fix bugs in tests and in the depcomp script
diff --git a/tests/defs.in b/tests/defs.in
index 8aaf108fb..cf07a4eeb 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 a2e71d729..1f27f69b3 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 c73ca1823..403a3767d 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 34f46c55c..4b0f45d79 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