Test groups are now run two directories deeper.

* lib/autoconf/autotest.m4 (AC_CONFIG_TESTDIR): Replace srcdir,
top_srcdir and top_builddir with at_srcdir, at_top_srcdir and
at_top_builddir.
* lib/autotest/general.m4 (AT_INIT): Compute srcdir,
top_srcdir, builddir and top_builddir.
Use `at_*dir' relatively to the directory containing the
suite, use `*dir' when relatively to the current group dir.

diff --git a/ChangeLog b/ChangeLog
index caeb13bfbdcebe124f452c60eb8f1016f79a47ef..5c2e6512fd71a636e8c80530af06e2d862150717 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-11-26  Akim Demaille  <akim@epita.fr>
+
+       Test groups are now run two directories deeper.
+
+       * lib/autoconf/autotest.m4 (AC_CONFIG_TESTDIR): Replace srcdir,
+       top_srcdir and top_builddir with at_srcdir, at_top_srcdir and
+       at_top_builddir.
+       * lib/autotest/general.m4 (AT_INIT): Compute srcdir,
+       top_srcdir, builddir and top_builddir.
+       Use `at_*dir' relatively to the directory containing the
+       suite, use `*dir' when relatively to the current group dir.
+
 2001-11-25  Joseph S. Myers  <jsm28@cam.ac.uk>
 
        * doc/autoconf.texi, TODO, lib/autoconf/fortran.m4,

diff --git a/lib/autoconf/autotest.m4 b/lib/autoconf/autotest.m4
index 431cab3fa022a3a96b4a08c9b9cd61e0a332c17f..40062b40af5287f808ac697e07216e19d9a15536 100644 (file)
--- a/lib/autoconf/autotest.m4
+++ b/lib/autoconf/autotest.m4
@@ -85,13 +85,14 @@ AC_CONFIG_COMMANDS([$1/atconfig],
 @%:@ Generated by $[0].
 @%:@ Copyright 2000, 2001 Free Software Foundation, Inc.
 
+# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
 at_testdir='$1'
 buildpath='$ac_buildpath'
-srcdir='$ac_srcdir'
+at_srcdir='$ac_srcdir'
 srcpath='$ac_srcpath'
-top_srcdir='$ac_top_srcdir'
+at_top_srcdir='$ac_top_srcdir'
 top_srcpath='$ac_top_srcpath'
-top_builddir='$ac_top_builddir'
+at_top_builddir='$ac_top_builddir'
 top_buildpath='$ac_top_buildpath'
 
 AUTOTEST_PATH='m4_default([$2], [$1])'

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index e952c57c2c9f7c5b37c3468aa1b7094adb66680d..ac34b32fb0ff387f5198d816116437408e7c58e1 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -110,6 +110,17 @@ do
   . ./$at_file || AS_ERROR([invalid content: $at_file])
 done
 
+# atconfig delivers paths relative to the directory the test suite is
+# in, but the groups themselves are run in testsuite-dir/group-dir.
+if test -n "$at_top_srcdir"; then
+  builddir=../..
+  for at_dir in srcdir top_srcdir top_builddir
+  do
+    at_val=AS_VAR_GET(at_$at_dir)
+    AS_VAR_SET($at_dir, $at_val/../..)
+  done
+fi
+
 AUTOTEST_PATH=`echo $AUTOTEST_PATH | tr ':' $PATH_SEPARATOR`
 
 # Not all shells have the 'times' builtin; the subshell is needed to make
@@ -349,13 +360,13 @@ _AS_PATH_WALK([$AUTOTEST_PATH $PATH],
     at_path=$at_path$PATH_SEPARATOR$as_dir
     ;;
   * )
-    if test -z "$top_builddir"; then
+    if test -z "$at_top_builddir"; then
       # Stand-alone test suite.
       at_path=$at_path$PATH_SEPARATOR$as_dir
     else
       # Embedded test suite.
-      at_path=$at_path$PATH_SEPARATOR$top_builddir/$as_dir
-      at_path=$at_path$PATH_SEPARATOR$top_srcdir/$as_dir
+      at_path=$at_path$PATH_SEPARATOR$at_top_builddir/$as_dir
+      at_path=$at_path$PATH_SEPARATOR$at_top_srcdir/$as_dir
     fi
     ;;
 esac])
@@ -406,10 +417,10 @@ AS_BOX(m4_defn([AT_TESTSUITE_NAME])[.])
   # exact version.  Use the relative dir: if the top dir is a symlink,
   # find will not follow it (and options to follow the links are not
   # portable), which would result in no output here.
-  if test -n "$top_srcdir"; then
+  if test -n "$at_top_srcdir"; then
     AS_BOX([ChangeLogs.])
     echo
-    for at_file in `find "$top_srcdir" -name ChangeLog -print`
+    for at_file in `find "$at_top_srcdir" -name ChangeLog -print`
     do
       echo "$as_me: $at_file:"
       sed 's/^/| /;10q' $at_file
@@ -644,10 +655,10 @@ elif test $at_debug_p = false; then
 
   {
     echo
-    if test -n "$top_srcdir"; then
+    if test -n "$at_top_srcdir"; then
       AS_BOX([Configuration logs.])
       echo
-      for at_file in `find "$top_srcdir" -name config.log -print`
+      for at_file in `find "$at_top_srcdir" -name config.log -print`
       do
        echo "$as_me: $at_file:"
        sed 's/^/| /' $at_file