diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-09-26 14:35:47 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-09-26 14:51:11 +0200 |
| commit | 11b192127cac086338bfaa43f3bab3acda8e3a20 (patch) | |
| tree | 3e5f718eca75627a5035b3d7c3ee896a56610a13 /tests/skeletons.at | |
| parent | 37cfa1195debf4261cac67fb2875d04da589a88f (diff) | |
| parent | bd52638008b361db9b368923a976a08d934efcd7 (diff) | |
| download | bison-11b192127cac086338bfaa43f3bab3acda8e3a20.tar.gz | |
Merge branch 'maint'
* maint:
warnings: introduce -Wdeprecated in the usage info
errors: prefix the output with "error: "
errors: indent "invalid value for %define" context
errors: indent "%define var" redefinition context
errors: indent "symbol redeclaration" context
errors: indent "result type clash" error context
Conflicts:
src/complain.c
src/muscle-tab.c
src/reader.c
src/symtab.c
tests/conflicts.at
tests/input.at
tests/named-refs.at
tests/output.at
tests/skeletons.at
Diffstat (limited to 'tests/skeletons.at')
| -rw-r--r-- | tests/skeletons.at | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/skeletons.at b/tests/skeletons.at index ce32e88b..ce079d62 100644 --- a/tests/skeletons.at +++ b/tests/skeletons.at @@ -157,7 +157,7 @@ start: ; ]]) AT_BISON_CHECK([[input.y]], [[1]], [[]], -[[<skeleton default value>: invalid value for %define Boolean variable 'foo' +[[<skeleton default value>: error: invalid value for %define Boolean variable 'foo' ]]) AT_CLEANUP @@ -193,8 +193,8 @@ start: ; AT_BISON_CHECK([[input1.y]], [[1]], [[]], [[input1.y: warning: foow fubar [-Wother] foow.y:2.3-5.3: warning: foowat fubar [-Wother] -input1.y: fooc fubar -fooc.y:1.1-10.5: foocat fubar +input1.y: error: fooc fubar +fooc.y:1.1-10.5: error: foocat fubar input1.y: fatal error: foof fubar ]]) @@ -264,7 +264,7 @@ start: ; ]]) AT_BISON_CHECK([[input1.y]], [[1]], [[]], -[[input1.y: non-fatal error +[[input1.y: error: non-fatal error input1.y: fatal error: M4 should exit immediately here ]]) |