From 38654f5e74d966b45393bd3bdfe718f19e27ba30 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 27 Mar 2013 22:40:58 +0000 Subject: [PATCH] Add key-sequence checking to rulescomp Make sure we're actually getting the keymaps we're hoping to compile. Signed-off-by: Daniel Stone --- Makefile.am | 4 +- test/rulescomp.c | 197 ++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 139 insertions(+), 62 deletions(-) diff --git a/Makefile.am b/Makefile.am index 87b2b51..0cd357a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -121,7 +121,6 @@ AM_TESTS_ENVIRONMENT = \ TESTS = \ test/keysym \ test/filecomp \ - test/rulescomp \ test/context \ test/rules-file \ test/stringcomp \ @@ -149,7 +148,8 @@ check_PROGRAMS = \ if BUILD_LINUX_TESTS TESTS += \ test/state \ - test/keyseq + test/keyseq \ + test/rulescomp test_keyseq_LDADD = $(TESTS_LDADD) test_state_LDADD = $(TESTS_LDADD) diff --git a/test/rulescomp.c b/test/rulescomp.c index 0bf0725..97b4315 100644 --- a/test/rulescomp.c +++ b/test/rulescomp.c @@ -21,6 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ +#include #include #include "test.h" @@ -28,22 +29,42 @@ #define BENCHMARK_ITERATIONS 1000 static int -test_rmlvo(struct xkb_context *context, const char *rules, - const char *model, const char *layout, - const char *variant, const char *options) +test_rmlvo_va(struct xkb_context *context, const char *rules, + const char *model, const char *layout, + const char *variant, const char *options, va_list ap) { struct xkb_keymap *keymap; + int ret; keymap = test_compile_rules(context, rules, model, layout, variant, options); - if (keymap) { - fprintf(stderr, "Compiled '%s' '%s' '%s' '%s' '%s'\n", - strnull(rules), strnull(model), strnull(layout), - strnull(variant), strnull(options)); - xkb_keymap_unref(keymap); - } + if (!keymap) + return 0; - return keymap != NULL; + fprintf(stderr, "Compiled '%s' '%s' '%s' '%s' '%s'\n", + strnull(rules), strnull(model), strnull(layout), + strnull(variant), strnull(options)); + + ret = test_key_seq_va(keymap, ap); + + xkb_keymap_unref(keymap); + + return ret; +} + +static int +test_rmlvo(struct xkb_context *context, const char *rules, + const char *model, const char *layout, const char *variant, + const char *options, ...) +{ + va_list ap; + int ret; + + va_start(ap, options); + ret = test_rmlvo_va(context, rules, model, layout, variant, options, ap); + va_end(ap); + + return ret; } static int @@ -61,40 +82,16 @@ test_rmlvo_silent(struct xkb_context *context, const char *rules, return keymap != NULL; } -static void -benchmark(struct xkb_context *context) -{ - struct timespec start, stop, elapsed; - enum xkb_log_level old_level = xkb_context_get_log_level(context); - int old_verb = xkb_context_get_log_verbosity(context); - int i; - - xkb_context_set_log_level(context, XKB_LOG_LEVEL_CRITICAL); - xkb_context_set_log_verbosity(context, 0); - - clock_gettime(CLOCK_MONOTONIC, &start); - for (i = 0; i < BENCHMARK_ITERATIONS; i++) - assert(test_rmlvo_silent(context, "evdev", "evdev", "us", "", "")); - clock_gettime(CLOCK_MONOTONIC, &stop); - - xkb_context_set_log_level(context, old_level); - xkb_context_set_log_verbosity(context, old_verb); - - elapsed.tv_sec = stop.tv_sec - start.tv_sec; - elapsed.tv_nsec = stop.tv_nsec - start.tv_nsec; - if (elapsed.tv_nsec < 0) { - elapsed.tv_nsec += 1000000000; - elapsed.tv_sec--; - } - - fprintf(stderr, "compiled %d keymaps in %ld.%09lds\n", - BENCHMARK_ITERATIONS, elapsed.tv_sec, elapsed.tv_nsec); -} - static int test_rmlvo_env(struct xkb_context *ctx, const char *rules, const char *model, - const char *layout, const char *variant, const char *options) + const char *layout, const char *variant, const char *options, + ...) { + va_list ap; + int ret; + + va_start (ap, options); + if (!isempty(rules)) setenv("XKB_DEFAULT_RULES", rules, 1); else @@ -120,7 +117,41 @@ test_rmlvo_env(struct xkb_context *ctx, const char *rules, const char *model, else unsetenv("XKB_DEFAULT_OPTIONS"); - return test_rmlvo(ctx, NULL, NULL, NULL, NULL, NULL); + ret = test_rmlvo_va(ctx, NULL, NULL, NULL, NULL, NULL, ap); + + va_end(ap); + + return ret; +} + +static void +benchmark(struct xkb_context *context) +{ + struct timespec start, stop, elapsed; + enum xkb_log_level old_level = xkb_context_get_log_level(context); + int old_verb = xkb_context_get_log_verbosity(context); + int i; + + xkb_context_set_log_level(context, XKB_LOG_LEVEL_CRITICAL); + xkb_context_set_log_verbosity(context, 0); + + clock_gettime(CLOCK_MONOTONIC, &start); + for (i = 0; i < BENCHMARK_ITERATIONS; i++) + assert(test_rmlvo_silent(context, "evdev", "evdev", "us", "", "")); + clock_gettime(CLOCK_MONOTONIC, &stop); + + xkb_context_set_log_level(context, old_level); + xkb_context_set_log_verbosity(context, old_verb); + + elapsed.tv_sec = stop.tv_sec - start.tv_sec; + elapsed.tv_nsec = stop.tv_nsec - start.tv_nsec; + if (elapsed.tv_nsec < 0) { + elapsed.tv_nsec += 1000000000; + elapsed.tv_sec--; + } + + fprintf(stderr, "compiled %d keymaps in %ld.%09lds\n", + BENCHMARK_ITERATIONS, elapsed.tv_sec, elapsed.tv_nsec); } int @@ -135,30 +166,76 @@ main(int argc, char *argv[]) return 0; } - assert(test_rmlvo(ctx, "evdev", "pc105", "us,il,ru,ca", ",,,multix", "grp:alts_toggle,ctrl:nocaps,compose:rwin")); - assert(test_rmlvo(ctx, "base", "pc105", "us,in", "", "")); - assert(test_rmlvo(ctx, "evdev", "pc105", "us", "intl", "")); - assert(test_rmlvo(ctx, "evdev", "evdev", "us", "intl", "grp:alts_toggle")); +#define KS(name) xkb_keysym_from_name(name, 0) + + assert(test_rmlvo(ctx, "evdev", "pc105", "us,il,ru,ca", ",,,multix", "grp:alts_toggle,ctrl:nocaps,compose:rwin", + KEY_Q, BOTH, XKB_KEY_q, NEXT, + KEY_LEFTALT, DOWN, XKB_KEY_Alt_L, NEXT, + KEY_RIGHTALT, DOWN, XKB_KEY_ISO_Next_Group, NEXT, + KEY_RIGHTALT, UP, XKB_KEY_ISO_Level3_Shift, NEXT, + KEY_LEFTALT, UP, XKB_KEY_Alt_L, NEXT, + KEY_Q, BOTH, XKB_KEY_slash, NEXT, + KEY_LEFTSHIFT, DOWN, XKB_KEY_Shift_L, NEXT, + KEY_Q, BOTH, XKB_KEY_Q, NEXT, + KEY_RIGHTMETA, BOTH, XKB_KEY_Multi_key, FINISH)); + assert(test_rmlvo(ctx, "evdev", "pc105", "us,in", "", "grp:alts_toggle", + KEY_A, BOTH, XKB_KEY_a, NEXT, + KEY_LEFTALT, DOWN, XKB_KEY_Alt_L, NEXT, + KEY_RIGHTALT, DOWN, XKB_KEY_ISO_Next_Group, NEXT, + KEY_RIGHTALT, UP, XKB_KEY_ISO_Level3_Shift, NEXT, + KEY_LEFTALT, UP, XKB_KEY_Alt_L, NEXT, + KEY_A, BOTH, KS("U094b"), FINISH)); + assert(test_rmlvo(ctx, "evdev", "pc105", "us", "intl", "", + KEY_GRAVE, BOTH, XKB_KEY_dead_grave, FINISH)); + assert(test_rmlvo(ctx, "evdev", "evdev", "us", "intl", "grp:alts_toggle", + KEY_GRAVE, BOTH, XKB_KEY_dead_grave, FINISH)); /* 20 is not a legal group; make sure this is handled gracefully. */ - assert(test_rmlvo(ctx, "evdev", "", "us:20", "", "")); - - /* Don't choke on missing values in RMLVO. Should just skip them. */ - assert(test_rmlvo(ctx, "evdev", "", "us,,ca", "", "")); - - assert(test_rmlvo(ctx, "", "", "", "", "")); - - assert(!test_rmlvo(ctx, "does-not-exist", "", "", "", "")); - - assert(test_rmlvo_env(ctx, "evdev", "", "us", "", "")); - assert(test_rmlvo_env(ctx, "evdev", "", "us", "", "ctrl:nocaps")); - assert(test_rmlvo_env(ctx, "evdev", "", "us,ca", ",,,multix", "grp:alts_toggle")); - assert(!test_rmlvo_env(ctx, "broken", "what-on-earth", "invalid", "", "")); + assert(test_rmlvo(ctx, "evdev", "", "us:20", "", "", + KEY_A, BOTH, XKB_KEY_a, FINISH)); + + /* Don't choke on missing values in RMLVO. Should just skip them. + Currently generates us,us,ca. */ + assert(test_rmlvo(ctx, "evdev", "", "us,,ca", "", "grp:alts_toggle", + KEY_A, BOTH, XKB_KEY_a, NEXT, + KEY_LEFTALT, DOWN, XKB_KEY_Alt_L, NEXT, + KEY_RIGHTALT, DOWN, XKB_KEY_ISO_Next_Group, NEXT, + KEY_RIGHTALT, UP, XKB_KEY_ISO_Next_Group, NEXT, + KEY_LEFTALT, UP, XKB_KEY_Alt_L, NEXT, + KEY_LEFTALT, DOWN, XKB_KEY_Alt_L, NEXT, + KEY_RIGHTALT, DOWN, XKB_KEY_ISO_Next_Group, NEXT, + KEY_RIGHTALT, UP, XKB_KEY_ISO_Level3_Shift, NEXT, + KEY_LEFTALT, UP, XKB_KEY_Alt_L, NEXT, + KEY_APOSTROPHE, BOTH, XKB_KEY_dead_grave, FINISH)); + + assert(test_rmlvo(ctx, "", "", "", "", "", + KEY_A, BOTH, XKB_KEY_a, FINISH)); + + assert(!test_rmlvo(ctx, "does-not-exist", "", "", "", "", + KEY_A, BOTH, XKB_KEY_a, FINISH)); + + assert(test_rmlvo_env(ctx, "evdev", "", "us", "", "", + KEY_A, BOTH, XKB_KEY_a, FINISH)); + assert(test_rmlvo_env(ctx, "evdev", "", "us", "", "ctrl:nocaps", + KEY_CAPSLOCK, BOTH, XKB_KEY_Control_L, FINISH)); + + /* Ignores multix and generates us,ca. */ + assert(test_rmlvo_env(ctx, "evdev", "", "us,ca", ",,,multix", "grp:alts_toggle", + KEY_A, BOTH, XKB_KEY_a, NEXT, + KEY_LEFTALT, DOWN, XKB_KEY_Alt_L, NEXT, + KEY_RIGHTALT, DOWN, XKB_KEY_ISO_Next_Group, NEXT, + KEY_RIGHTALT, UP, XKB_KEY_ISO_Level3_Shift, NEXT, + KEY_LEFTALT, UP, XKB_KEY_Alt_L, NEXT, + KEY_GRAVE, UP, XKB_KEY_numbersign, FINISH)); + + assert(!test_rmlvo_env(ctx, "broken", "what-on-earth", "invalid", "", "", + KEY_A, BOTH, XKB_KEY_a, FINISH)); xkb_context_unref(ctx); ctx = test_get_context(0); - assert(test_rmlvo_env(ctx, "broken", "but", "ignored", "per", "ctx flags")); + assert(test_rmlvo_env(ctx, "broken", "but", "ignored", "per", "ctx flags", + KEY_A, BOTH, XKB_KEY_a, FINISH)); /* Test response to invalid flags. */ { -- 2.7.4