tests: normalize trailing spaces in gcc -E -dD output.

* tests/compile.at (AC_LANG_SOURCE example)
(AC_LANG_PROGRAM example): Remove trailing spaces before
comparing with expected output.  Fixes testsuite failure
with GCC 2.95.3 on Haiku.
Report by Scott McCreary.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 8dba8bfd4eba4d365f9fbfddb510d41d96298539..78590f17f5c537c0e50cbb7f9c03ad9b9617cc7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       tests: normalize trailing spaces in gcc -E -dD output.
+       * tests/compile.at (AC_LANG_SOURCE example)
+       (AC_LANG_PROGRAM example): Remove trailing spaces before
+       comparing with expected output.  Fixes testsuite failure
+       with GCC 2.95.3 on Haiku.
+       Report by Scott McCreary.
+
 2010-09-22  Eric Blake  <eblake@redhat.com>
 
        Release Version 2.68.

diff --git a/tests/compile.at b/tests/compile.at
index dd7175b0794d459bf647bf6e44dd202295b0da58..a39a6f19b92ba790617e78a9e1616b31f71dd23c 100644 (file)
--- a/tests/compile.at
+++ b/tests/compile.at
@@ -193,7 +193,7 @@ AT_CHECK_CONFIGURE([], [], [stdout])
 # Note that the output may contain more defines and lines matching
 #   # 1 "conftest.c"
 # so delete everything before the interesting output.
-AT_CHECK([sed -n '/#define PACKAGE/,$p' stdout], [],
+AT_CHECK([sed -n 's/ *$//; /#define PACKAGE/,$p' stdout], [],
 [[#define PACKAGE_NAME "Hello"
 #define PACKAGE_TARNAME "hello"
 #define PACKAGE_VERSION "1.0"
@@ -238,7 +238,7 @@ AT_CHECK_CONFIGURE([], [], [stdout])
 # Note that the output may contain more defines and lines matching
 #   # 1 "conftest.c"
 # so delete everything before the interesting output.
-AT_CHECK([sed -n '/#define PACKAGE/,$p' stdout], [],
+AT_CHECK([sed -n 's/ *$//; /#define PACKAGE/,$p' stdout], [],
 [[#define PACKAGE_NAME "Hello"
 #define PACKAGE_TARNAME "hello"
 #define PACKAGE_VERSION "1.0"