From c826013fb38c98861ef0fc5d4dc3fb3fb4f555be Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Wed, 14 Apr 2010 16:40:18 +0200 Subject: [PATCH] tests: enhance AT_SYNCLINES_COMPILE. * tests/synclines.at (AT_SYNCLINES_COMPILE): More distcc patterns. (AT_TEST_SYNCLINE): Remove GCC 4.5 protection which is already taken care of in AT_SYNCLINES_COMPILE. --- ChangeLog | 7 +++++++ tests/synclines.at | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 216c2e8a..63379f55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-05-04 Akim Demaille + + tests: enhance AT_SYNCLINES_COMPILE. + * tests/synclines.at (AT_SYNCLINES_COMPILE): More distcc patterns. + (AT_TEST_SYNCLINE): Remove GCC 4.5 protection which is already + taken care of in AT_SYNCLINES_COMPILE. + 2010-05-04 Akim Demaille lalr1.cc: don't generate location.hh when location_type is defined diff --git a/tests/synclines.at b/tests/synclines.at index d7739625..83a26d05 100644 --- a/tests/synclines.at +++ b/tests/synclines.at @@ -47,8 +47,13 @@ m4_define([AT_SYNCLINES_COMPILE], # distcc[33187] ERROR: compile (null) on localhost failed # syncline.c:1:2: error: #error "1" # distcc[33185] ERROR: compile syncline.c on localhost failed +# +# or even +# +# distcc[35882] (dcc_connect_by_name) ERROR: failed to look up host "chrisimac": Unknown host +# distcc[35882] Warning: failed to distribute input.c to chrisimac/4, running locally instead -AT_CHECK([[sed -e '/^distcc\[[0-9]*\] ERROR: .*/d' \ +AT_CHECK([[sed -e '/^distcc\[[0-9]*\] /d' \ -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' \ -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/' \ -e "/^[^:]*: In function '[^\']*':$/d" \ @@ -90,9 +95,7 @@ AT_CHECK([[test "`cat stdout`" = 'syncline.c:1: @%:@error "1"' || exit 77]]) AT_DATA([[input.y]], [$2]) AT_BISON_CHECK([-o input.c input.y]) AT_SYNCLINES_COMPILE([input.c]) -# GCC 4.5 tells you the function within which #error appears, but -# previous versions of gcc do not. -AT_CHECK([grep -v ': In function ' stdout], 0, [$3]) +AT_CHECK([cat stdout], 0, [$3]) AT_CLEANUP ]) -- 2.45.2