* tests/atgeneral.m4 (AT_DATA): Use _ATEOF instead of EOF.

diff --git a/ChangeLog b/ChangeLog
index 7deefc3fa6c34df39607104bd8740cbf6c86a226..4d97630c0c0d06f01a6eea9d7f0542ecbde8b6d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-19  Pavel Roskin  <proski@gnu.org>
+
+       * tests/atgeneral.m4 (AT_DATA): Use _ATEOF instead of EOF.
+
 2000-09-19  Pavel Roskin  <proski@gnu.org>
 
        * tests/semantics.m4 (AC_PROG_CPP with warnings): Minor

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 9077a1cc287f2d1d17b3c493ce9332ef45ab9c55..d86bda0ef24143d8bde0b28cf6b566200673e097 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1,4 +1,4 @@
-divert(-1)                                             -*- shell-script -*-
+divert(-1)                                                 -*- Autoconf -*-
 # `m4' macros used in building test suites.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 
@@ -283,12 +283,12 @@ $at_traceon
 
 
 # AT_CLEANUP(FILES)
-
+# -----------------
 # Complete a group of related tests, recursively remove those FILES
 # created within the test.  There is no need to list stdout, stderr,
 # nor files created with AT_DATA.
 
-AT_DEFINE(AT_CLEANUP,
+AT_DEFINE([AT_CLEANUP],
 $at_traceoff
 [[#] Snippet )s[]AT_ordinal[])
     )
@@ -324,21 +324,21 @@ popdef([AT_group_description])])
 
 
 # AT_DATA(FILE, CONTENTS)
-
+# -----------------------
 # Initialize an input data FILE with given CONTENTS, which should end with
 # an end of line.
 # This macro is not robust to active symbols in CONTENTS *on purpose*.
 # If you don't want CONTENT to be evaluated, quote it twice.
 
-AT_DEFINE(AT_DATA,
+AT_DEFINE([AT_DATA],
 [AT_DEFINE([AT_data_files], AT_data_files[ ]$1)
-cat > $1 <<'EOF'
-$2[]EOF
+cat >$1 <<'_ATEOF'
+$2[]_ATEOF
 ])
 
 
 # AT_CHECK(COMMANDS, [STATUS], STDOUT, STDERR)
-
+# --------------------------------------------
 # Execute a test by performing given shell COMMANDS.  These commands
 # should normally exit with STATUS, while producing expected STDOUT and
 # STDERR contents.  The special word `expout' for STDOUT means that file

diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index 9077a1cc287f2d1d17b3c493ce9332ef45ab9c55..d86bda0ef24143d8bde0b28cf6b566200673e097 100644 (file)
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -1,4 +1,4 @@
-divert(-1)                                             -*- shell-script -*-
+divert(-1)                                                 -*- Autoconf -*-
 # `m4' macros used in building test suites.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 
@@ -283,12 +283,12 @@ $at_traceon
 
 
 # AT_CLEANUP(FILES)
-
+# -----------------
 # Complete a group of related tests, recursively remove those FILES
 # created within the test.  There is no need to list stdout, stderr,
 # nor files created with AT_DATA.
 
-AT_DEFINE(AT_CLEANUP,
+AT_DEFINE([AT_CLEANUP],
 $at_traceoff
 [[#] Snippet )s[]AT_ordinal[])
     )
@@ -324,21 +324,21 @@ popdef([AT_group_description])])
 
 
 # AT_DATA(FILE, CONTENTS)
-
+# -----------------------
 # Initialize an input data FILE with given CONTENTS, which should end with
 # an end of line.
 # This macro is not robust to active symbols in CONTENTS *on purpose*.
 # If you don't want CONTENT to be evaluated, quote it twice.
 
-AT_DEFINE(AT_DATA,
+AT_DEFINE([AT_DATA],
 [AT_DEFINE([AT_data_files], AT_data_files[ ]$1)
-cat > $1 <<'EOF'
-$2[]EOF
+cat >$1 <<'_ATEOF'
+$2[]_ATEOF
 ])
 
 
 # AT_CHECK(COMMANDS, [STATUS], STDOUT, STDERR)
-
+# --------------------------------------------
 # Execute a test by performing given shell COMMANDS.  These commands
 # should normally exit with STATUS, while producing expected STDOUT and
 # STDERR contents.  The special word `expout' for STDOUT means that file