* doc/autoconf.texi (Writing testsuite.at) <AT_CHECK>: Complete.

* lib/autotest/general.m4 (AT_INIT): Use the relative dir when
looking for ChangeLogs.

diff --git a/ChangeLog b/ChangeLog
index 34ec3b05a6050327a7df79fc2e583bf85eb32c83..f9ace3720ca9478edba01099be04c0262f69705c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-17  Akim Demaille  <akim@epita.fr>
+
+       * doc/autoconf.texi (Writing testsuite.at) <AT_CHECK>: Complete.
+       * lib/autotest/general.m4 (AT_INIT): Use the relative dir when
+       looking for ChangeLogs.
+
 2001-08-17  Akim Demaille  <akim@epita.fr>
 
        * bin/autom4te.in: --normalize is a new option.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 01e85501ff092b4993095464c144f64c6a50c45d..673bb3b93a985cdf7f9c3436100bd13d6ec25d93 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -11266,26 +11266,29 @@ with @code{AT_DATA}.
 @defmac AT_DATA (@var{file}, @var{contents})
 @atindex DATA
 Initialize an input data @var{file} with given @var{contents}.  Of
-course, @var{contents} might have to be properly quoted between square
-brackets to protect against included commas or spurious @code{m4}
-expansion.  The contents ought to end with an end of line.
+course, @var{contents} has to be properly quoted between square brackets
+to protect against included commas or spurious @code{m4} expansion.  The
+contents ought to end with an end of line.
 @end defmac
 
 @defmac AT_CHECK (@var{commands}, @ovar{status = 0}, @ovar{stdout}, @ovar{stderr})
 @atindex CHECK
-This macro has up to four arguments: @var{commands}, @var{status},
-@var{stdout} and @var{stderr}.  The @var{commands} argument is
-mandatory, and @code{m4} quoting is often useful.
-
-The macro executes a test by performing given shell @var{commands}.
-These commands should normally exit with @var{status}, while producing
-expected @var{stdout} and @var{stderr} contents.  Unless empty,
-@var{status} is a decimal integer; exit status is not checked if
-@var{status} is empty.  The special word @code{expout} for @var{stdout}
-means that file @file{expout} contents has been preset to the expected
-standard output.  The special word @code{experr} for @var{stderr} means
-that file @file{experr} contents has been preset to the expected
-standard error output.
+Execute a test by performing given shell @var{commands}.  These commands
+should normally exit with @var{status}, while producing expected
+@var{stdout} and @var{stderr} contents.  If @var{commands} exits with
+status 77, then the whole test group is skipped.
+
+The @var{commands} @emph{must not} redirect the standard output, nor the
+standard error.
+
+If @var{status}, or @var{stdout}, or @var{stderr} is @samp{ignore}, then
+the corresponding value is not checked.
+
+The special value @samp{expout} for @var{stdout} means the expected
+output of the @var{commands} is the content of the file @file{expout}.
+If @var{stdout} is @samp{stdout}, then the standard output of the
+@var{commands} is available for further tests in the file @file{stdout}.
+Similarly for @var{stderr} with @samp{expout} and @samp{stderr}.
 @end defmac
 
 

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 52e9238db4b049c8b22a6c7c180f423e0c81bab6..5a0c415dc1fc2f2ddeea4a794449de2fc4865679 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -226,8 +226,10 @@ else
     echo
 
     # Try to find a few ChangeLogs in case it might help determining the
-    # exact version.
-    find "$at_top_srcdir" -name ChangeLog \
+    # 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.
+    find "$top_srcdir" -name ChangeLog \
       -exec echo {} : ';' \
       -exec sed 's/^/| /;10q' {} ';' \
       -exec echo ';'