summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-05-28 17:53:00 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-06-06 09:22:33 -0400
commitaa63b56f5f56c9aa9b0ed00b4213c258c629c614 (patch)
tree02f7e722af41182e97637d0d8e93f19b8e78eb3e /Makefile.am
parent4897d1dc0f00f1571b0cc78ec4a20cd78c6c3ade (diff)
keymap-util: add tests and fix one small bug
When converting an empty x11 variant, we would not delete vconsole mapping properly. find_legacy_keymap() is made non-static. I think it's important to be able to test it. In principle we could also test it through the higher-level interface of x11_convert_to_vconsole, but x11_convert_to_vconsole also uses find_converted_keymap, and it's better to test at this lower level. Note that find_legacy_keymap might be a bit of a misnomer, because we'd probably want to keep kbd-model-map even if the "legacy" layouts went away. So we might want to change this name, but I'm leaving that for another commit.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am12
1 files changed, 12 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 4ff39987ac..fc6f3bf6d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4782,6 +4782,18 @@ dist_pkgdata_DATA = \
src/locale/kbd-model-map \
src/locale/language-fallback-map
+test_keymap_util_SOURCES = \
+ src/locale/test-keymap-util.c \
+ src/locale/keymap-util.c \
+ src/locale/keymap-util.h
+
+test_keymap_util_LDADD = \
+ libshared.la \
+ -ldl
+
+tests += \
+ test-keymap-util
+
localectl_SOURCES = \
src/locale/localectl.c