From 8449314a7a2ba0faf915a0842407ef73287b6d51 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Fri, 24 Sep 2010 06:34:39 +0200 Subject: [PATCH] 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 --- ChangeLog | 9 +++++++++ tests/compile.at | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8dba8bfd..78590f17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-09-24 Ralf Wildenhues + + 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 Release Version 2.68. diff --git a/tests/compile.at b/tests/compile.at index dd7175b0..a39a6f19 100644 --- 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" -- 2.47.2