Tests defs: remove variable $testaclocaldir.

* tests/defs.in ($testaclocaldir): Removed.
* tests/aclocal.test: Use `$top_testsrcdir/m4' directly, no
t `$testaclocaldir'.

diff --git a/ChangeLog b/ChangeLog
index 2b41e2bd0b4e0fd8435124c7719ce580a5f22323..42e97f6d2475b1e306148dd582d676a9f9bd6b29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-09-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+       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

diff --git a/tests/aclocal.test b/tests/aclocal.test
index da80d0887738abd339c509306701e846b106ea66..3e78df9093fd8a99c8dcc923c3262edacd5c9c54 100755 (executable)
--- 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/defs.in b/tests/defs.in
index 7f6807c97338276863a8dda64d920c25706fa861..f73edd429fa300a2c205d0f9945b80f466cc6e17 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -371,8 +371,6 @@ case " $required " in
     ;;
 esac
 
-testaclocaldir=$top_testsrcdir/m4
-
 # POSIX no longer requires 'egrep' and 'fgrep',
 # but some hosts lack 'grep -E' and 'grep -F'.
 EGREP='@EGREP@'