Re: [GNU Autoconf 2.67] testsuite: 193 199 233 253 254 failed on Haiku

[Ralf Wildenhues]

* Ralf Wildenhues wrote on Tue, Aug 03, 2010 at 10:48:53PM CEST:
> * scott mc wrote on Tue, Aug 03, 2010 at 10:22:55PM CEST:
> 
> |  253: compile.at:170     AC_LANG_SOURCE example
> |  254: compile.at:216     AC_LANG_PROGRAM example
> 
> These are actual bugs in the Autoconf testsuite (but not in the rest of
> Autoconf).  Will fix.

The sed script to throw away the "uninteresting" parts of conftest.c
was broken: it did not do what it claimed (removing everything up to
the last `# 1 "conftest.c"' line) but only everything up to the first
such line, starting search in the second line.  Since on other systems,
more than one such line may occur, let's just search for the first
interesting line instead.

OK to commit, and OK to add you to THANKS, Scott?

Thanks,
Ralf

    Fix AC_LANG_SOURCE and AC_LANG_PROGRAM tests.
    
    * tests/compile.at (AC_LANG_SOURCE example)
    (AC_LANG_PROGRAM example): Fix broken sed script for
    extracting the interesting part of the conftest.c file.
    * THANKS: Update.
    Report by Scott McCreary.

diff --git a/tests/compile.at b/tests/compile.at
index 028f456..6a1092b 100644
--- a/tests/compile.at
+++ b/tests/compile.at
@@ -190,12 +190,11 @@ gcc -E -dD conftest.c || AS_EXIT([77])
 AT_CHECK_AUTOCONF
 AT_CHECK_CONFIGURE([], [], [stdout])
 # Taken from autoconf.texi:Generating Sources.
-# Note that the output may contain more than one line matching
+# Note that the output may contain more defines and lines matching
 #   # 1 "conftest.c"
-# so delete everything until the last one.
-AT_CHECK([sed  '1,/# 1 "conftest\.c"/d' stdout], [],
-[[
-#define PACKAGE_NAME "Hello"
+# so delete everything before the interesting output.
+AT_CHECK([sed -n '/#define PACKAGE/,$p' stdout], [],
+[[#define PACKAGE_NAME "Hello"
 #define PACKAGE_TARNAME "hello"
 #define PACKAGE_VERSION "1.0"
 #define PACKAGE_STRING "Hello 1.0"
@@ -236,12 +235,11 @@ gcc -E -dD conftest.c || AS_EXIT([77])
 AT_CHECK_AUTOCONF
 AT_CHECK_CONFIGURE([], [], [stdout])
 # Taken from autoconf.texi:Generating Sources.
-# Note that the output may contain more than one line matching
+# Note that the output may contain more defines and lines matching
 #   # 1 "conftest.c"
-# so delete everything until the last one.
-AT_CHECK([sed  '1,/# 1 "conftest\.c"/d' stdout], [],
-[[
-#define PACKAGE_NAME "Hello"
+# so delete everything before the interesting output.
+AT_CHECK([sed -n '/#define PACKAGE/,$p' stdout], [],
+[[#define PACKAGE_NAME "Hello"
 #define PACKAGE_TARNAME "hello"
 #define PACKAGE_VERSION "1.0"
 #define PACKAGE_STRING "Hello 1.0"