Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 16:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: don't duplicate the portability prologue

Browse Source 
* tests/actions.at, tests/input.at: Don't repeat the prologue, skip it.
* tests/diagnostics.at, tests/local.at: Comment changes.
This commit is contained in:
Akim Demaille
2019-05-03 08:58:59 +02:00
parent 013720f0e7
commit b5233ba323
4 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/actions.at
View File

@@ -196,16 +196,8 @@ one.y:11.3-8: previous declaration
bison: file 'one.y' was updated (backup: 'one.y~') bison: file 'one.y' was updated (backup: 'one.y~')
]]) ]])
AT_CHECK([cat one.y], [], AT_CHECK([sed -e '1,8d' one.y], [],
[[%code top { [[%%
/* Load config.h, and adjust to the compiler.
We used to do it here, but each time we add a new line,
we have to adjust all the line numbers in error messages.
It's simpler to use a constant include to a varying file. */
#include <testsuite.h>
}
%%
exp: exp:
%empty {} @&t@ %empty {} @&t@
; ;

4
tests/diagnostics.at
View File

@@ -20,6 +20,8 @@ AT_BANNER([[Diagnostics.]])
# AT_TEST($1: TITLE, $2: GRAMMAR, $3: EXIT-STATUS, $4: OUTPUT-WITH-STYLE) # AT_TEST($1: TITLE, $2: GRAMMAR, $3: EXIT-STATUS, $4: OUTPUT-WITH-STYLE)
# ----------------------------------------------------------------------- # -----------------------------------------------------------------------
# Run Bison on GRAMMAR with debugging style enabled, and expect
# OUTPUT-WITH-STYLE as diagnostics.
m4_pushdef([AT_TEST], m4_pushdef([AT_TEST],
[ [
AT_SETUP([$1]) AT_SETUP([$1])
@@ -221,7 +223,7 @@ input.y: <warning>warning:</warning> fix-its can be applied. Rerun with option
# Locations coming from m4 need the byte-column for diagnostics. # Locations coming from m4 need the byte-column for diagnostics.
AT_TEST([[Locations from M4]], AT_TEST([[Tabulations and multibyte characters from M4]],
[[%define api.prefix {sun} [[%define api.prefix {sun}
%define api.prefix {🌞} %define api.prefix {🌞}
%% %%

12
tests/input.at
View File

@@ -2590,16 +2590,8 @@ AT_CHECK([diff input.y.orig input.y~])
AT_CHECK([test ! -f output.c]) AT_CHECK([test ! -f output.c])
# Check the update. # Check the update.
AT_CHECK([cat input.y], [], AT_CHECK([sed -e '1,8d' input.y], [],
[[%code top { [[
/* Load config.h, and adjust to the compiler.
We used to do it here, but each time we add a new line,
we have to adjust all the line numbers in error messages.
It's simpler to use a constant include to a varying file. */
#include <testsuite.h>
}
%default-prec %default-prec
%define parse.error verbose %define parse.error verbose
%expect-rr 0 %expect-rr 0

6
tests/local.at
View File

@@ -390,7 +390,7 @@ m4_define([AT_DATA_SOURCE_PROLOGUE],
# AT_DATA_GRAMMAR_PROLOGUE # AT_DATA_GRAMMAR_PROLOGUE
# ------------------------ # ------------------------
# The prologue that should be included in any grammar which parser is # The prologue that should be included in any grammar whose parser is
# meant to be compiled. # meant to be compiled.
m4_define([AT_DATA_GRAMMAR_PROLOGUE], m4_define([AT_DATA_GRAMMAR_PROLOGUE],
[[%code top { [[%code top {
@@ -400,7 +400,7 @@ m4_define([AT_DATA_GRAMMAR_PROLOGUE],
# AT_DATA_SOURCE(NAME, CONTENT) # AT_DATA_SOURCE(NAME, CONTENT)
# ----------------------------- # -----------------------------
# Generate the file NAME, which CONTENT is preceded by # Generate the file NAME, whose CONTENT is preceded by
# AT_DATA_SOURCE_PROLOGUE. # AT_DATA_SOURCE_PROLOGUE.
m4_define([AT_DATA_SOURCE], m4_define([AT_DATA_SOURCE],
[AT_DATA([$1], [AT_DATA([$1],
@@ -411,7 +411,7 @@ $2])
# AT_DATA_GRAMMAR(NAME, CONTENT) # AT_DATA_GRAMMAR(NAME, CONTENT)
# ------------------------------ # ------------------------------
# Generate the file NAME, which CONTENT is preceded by # Generate the file NAME, whose CONTENT is preceded by
# AT_DATA_GRAMMAR_PROLOGUE. # AT_DATA_GRAMMAR_PROLOGUE.
m4_define([AT_DATA_GRAMMAR], [AT_LANG_DISPATCH([$0], $@)]) m4_define([AT_DATA_GRAMMAR], [AT_LANG_DISPATCH([$0], $@)])