From: Akim Demaille Date: Mon, 19 Jan 2015 17:51:54 +0000 (+0100) Subject: tests: be more robust to unrecognized synclines, and try to recognize xlc X-Git-Tag: v3.0.4~6 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/0b0370ff42af17689da7edf28294a5262e450610?ds=sidebyside tests: be more robust to unrecognized synclines, and try to recognize xlc Reported by Thomas Jahns. http://lists.gnu.org/archive/html/bug-bison/2015-01/msg00059.html * tests/synclines.at (AT_SYNCLINES_COMPILE): Rename as... (_AT_SYNCLINES_COMPILE): this. Try to recognize xlc locations. (AT_SYNCLINES_COMPILE): New. Skips the test if we can't read the synclines. --- diff --git a/tests/synclines.at b/tests/synclines.at index 260e2f9e..00c2fc1d 100644 --- a/tests/synclines.at +++ b/tests/synclines.at @@ -19,13 +19,13 @@ AT_BANNER([[User Actions.]]) -# AT_SYNCLINES_COMPILE(FILE) -# -------------------------- +# _AT_SYNCLINES_COMPILE(FILE) +# --------------------------- # Compile FILE expecting an error, and save in the file stdout the # normalized output. Ignore the exit status, since some compilers # (e.g. c89 on IRIX 6.5) trigger warnings on '#error', instead of # errors. -m4_define([AT_SYNCLINES_COMPILE], +m4_define([_AT_SYNCLINES_COMPILE], [AT_CHECK([$CC $CFLAGS $CPPFLAGS -c $1], [ignore], [], [stderr]) # Transform stderr into something like this: @@ -75,6 +75,12 @@ m4_define([AT_SYNCLINES_COMPILE], # When c++ is used to compiler C, we might have more messages (Clang 3.2): # # clang: warning: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated +# +# +# xlc reports things like: +# +# "input.yy", line 80.21: 1540-0218 (S) The call does not match any parameter list for "operator<<". +# "/usr/vacpp/include/iosfwd", line 32.6: 1506-205 (S) #error This file to be used only with IBM VisualAge C++ v4 and later compilers AT_CHECK([[$PERL -p -0777 - stderr <<\EOF # 1. Remove useless lines. @@ -92,6 +98,8 @@ AT_CHECK([[$PERL -p -0777 - stderr <<\EOF # 2. Normalize the lines we kept. + # xlc messages. Remove also error identifier (e.g., "1540-0218 (S)"). + s/^"(.*?)", line ([\w.]*): \d+-\d+ \(.\) /$][1:$][2: /gm; # Remove column. s/^([^:]+:\d+)[.:][^:]+:(.+)$/$][1:$][2/gm; # Map all combinations of "error: " and "#error: " to "#error ". @@ -101,13 +109,14 @@ EOF 0, [stdout]) ]) -# AT_TEST(TITLE, INPUT, ERROR-MSG) -# -------------------------------- -# Check that compiling the parser produced from INPUT cause GCC -# to issue ERROR-MSG. -m4_pushdef([AT_TEST], -[AT_SETUP([$1]) -AT_BISON_OPTION_PUSHDEFS + + +# AT_SYNCLINES_COMPILE(FILE) +# -------------------------- +# Compile FILE expecting an error, and save in the file stdout the +# normalized output. If we can't get a trustable location +# from the compiler, just skip the test. +# # It seems impossible to find a generic scheme to check the location # of an error. Even requiring GCC is not sufficient, since for instance # the version modified by Apple: @@ -124,15 +133,29 @@ AT_BISON_OPTION_PUSHDEFS # # | input.y:2: "2" # | cpp-precomp: warning: errors during smart preprocessing, retrying in basic mode - +m4_define([AT_SYNCLINES_COMPILE], +[# Check if we can trust location translation. AT_DATA([syncline.c], [[#error "1" int i; /* avoids -pedantic warning about an empty translation unit. */ ]]) -AT_SYNCLINES_COMPILE([syncline.c]) +_AT_SYNCLINES_COMPILE([syncline.c]) AT_CHECK([[test "`cat stdout`" = 'syncline.c:1: @%:@error "1"' || exit 77]]) +# Then work for real. +_AT_SYNCLINES_COMPILE([$1]) +]) + + +# AT_TEST(TITLE, INPUT, ERROR-MSG) +# -------------------------------- +# Check that compiling the parser produced from INPUT cause GCC +# to issue ERROR-MSG. +m4_pushdef([AT_TEST], +[AT_SETUP([$1]) +AT_BISON_OPTION_PUSHDEFS + AT_DATA([[input.y]], [$2]) AT_BISON_CHECK([-o input.c input.y]) AT_SYNCLINES_COMPILE([input.c])