diff options
| author | Akim Demaille <akim.demaille@gmail.com> | 2021-08-07 12:14:35 +0200 |
|---|---|---|
| committer | Akim Demaille <akim.demaille@gmail.com> | 2021-08-07 12:53:19 +0200 |
| commit | 6d86d26b3359b6e97b997537a8268d4d6583cdbf (patch) | |
| tree | 619d0111260bbbd1bfcdb2bf654f292180a3e0ca /tests | |
| parent | 80db1029e67e5d42fa6329489558b114fdfea880 (diff) | |
| download | bison-6d86d26b3359b6e97b997537a8268d4d6583cdbf.tar.gz | |
tests: factor iterating over skeletons
* tests/local.at (AT_FOR_EACH_SKEL): New.
Use where appropriate.
* data/skeletons/lalr1.d: Reject -d.
* tests/input.at, tests/scanner.at: Also check D.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/input.at | 7 | ||||
| -rw-r--r-- | tests/local.at | 9 | ||||
| -rw-r--r-- | tests/scanner.at | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/tests/input.at b/tests/input.at index f41c3657..632be1a3 100644 --- a/tests/input.at +++ b/tests/input.at @@ -2682,7 +2682,7 @@ start: %empty; # Only "full" and "none" are accepted for parse.lac # Unknown values (such as "unsupported") are rejected -m4_foreach([b4_skel], [[yacc.c], [lalr1.cc], [lalr1.java]], +m4_foreach([b4_skel], [[yacc.c], [lalr1.cc], [lalr1.d], [lalr1.java]], [AT_BISON_CHECK([[-S]b4_skel[ -Dparse.lac=none input.y]]) AT_BISON_CHECK([[-S]b4_skel[ -Dparse.lac=full input.y]]) AT_BISON_CHECK([[-S]b4_skel[ -Dparse.lac=unsupported input.y]], @@ -2926,9 +2926,8 @@ exp: # Disable -Wother to avoid the warnings about the suspicious presence # of `b4_canary` in the output. -m4_foreach([b4_skel], - [[yacc.c], [glr.c], [lalr1.cc], [glr.cc], [glr2.cc], [lalr1.d], [lalr1.java]], -[AT_BISON_CHECK([[-Wno-other -S ]b4_skel[ ]m4_bmatch(b4_skel, [.*\.java$], [], [-d])[ input.y]]) +AT_FOR_EACH_SKEL( +[AT_BISON_CHECK([[-Wno-other -S ]b4_skel[ ]m4_bmatch(b4_skel, [.*\.\(d\|java\)$], [], [-d])[ input.y]]) ]) ]) diff --git a/tests/local.at b/tests/local.at index 5dde77c2..e24c419d 100644 --- a/tests/local.at +++ b/tests/local.at @@ -157,6 +157,15 @@ m4_define([AT_SAVE_SPECIAL_FILES], [at_save_special_files]) m4_define([AT_RESTORE_SPECIAL_FILES], [at_restore_special_files]) +# AT_FOR_EACH_SKEL(BODY) +# ---------------------- +m4_define([AT_FOR_EACH_SKEL], +[m4_foreach([b4_skel], + [[yacc.c], [glr.c], [lalr1.cc], [glr.cc], [glr2.cc], [lalr1.d], [lalr1.java]], + [$1]) +]) + + ## ------------------------------- ## ## Macros decoding Bison options. ## diff --git a/tests/scanner.at b/tests/scanner.at index 852e7c9a..44bae6e8 100644 --- a/tests/scanner.at +++ b/tests/scanner.at @@ -323,7 +323,7 @@ AT_BISON_OPTION_POPDEFS AT_CLEANUP ]) -m4_foreach([b4_skel], [[yacc.c], [glr.c], [lalr1.cc], [glr.cc], [glr2.cc], [lalr1.java], [lalr1.d]], +AT_FOR_EACH_SKEL( [AT_TEST([%skeleton "]b4_skel["]) AT_TEST([%skeleton "]b4_skel[" %define api.token.raw])]) |