From 39f97cdaefbf03a2beeae2bb2d012927a1966d09 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 11 Nov 2021 15:38:04 +0100 Subject: [PATCH] test: use kbd-mode-map we ship in one more test case --- debian/patches/series | 1 + ...de-map-we-ship-in-one-more-test-case.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 debian/patches/test-use-kbd-mode-map-we-ship-in-one-more-test-case.patch diff --git a/debian/patches/series b/debian/patches/series index 24a15f3fe..be823d897 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,6 +10,7 @@ udev-node-check-stack-directory-change-even-if-devlink-is.patch udev-node-shorten-code-a-bit-and-update-log-message.patch udev-node-add-random-delay-on-conflict-in-updating-device.patch udev-node-drop-redundant-trial-of-devlink-creation.patch +test-use-kbd-mode-map-we-ship-in-one-more-test-case.patch debian/Use-Debian-specific-config-files.patch debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch debian/Make-run-lock-tmpfs-an-API-fs.patch diff --git a/debian/patches/test-use-kbd-mode-map-we-ship-in-one-more-test-case.patch b/debian/patches/test-use-kbd-mode-map-we-ship-in-one-more-test-case.patch new file mode 100644 index 000000000..e48f4296d --- /dev/null +++ b/debian/patches/test-use-kbd-mode-map-we-ship-in-one-more-test-case.patch @@ -0,0 +1,30 @@ +From: Yu Watanabe +Date: Thu, 11 Nov 2021 08:55:10 +0900 +Subject: test: use kbd-mode-map we ship in one more test case + +Follow-up for be0cc2ce6c947aafadb3f42dba405269f670b31c. + +Fixes https://github.com/systemd/systemd/pull/19670#issuecomment-965817823. + +(cherry picked from commit a914901d38e01b90e21883b6a2ca1bec21997201) +--- + src/locale/test-keymap-util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/locale/test-keymap-util.c b/src/locale/test-keymap-util.c +index a5d40af..f726e8e 100644 +--- a/src/locale/test-keymap-util.c ++++ b/src/locale/test-keymap-util.c +@@ -196,11 +196,11 @@ int main(int argc, char **argv) { + + test_find_language_fallback(); + test_find_converted_keymap(); +- test_find_legacy_keymap(); + + assert_se(get_testdata_dir("test-keymap-util/kbd-model-map", &map) >= 0); + assert_se(setenv("SYSTEMD_KBD_MODEL_MAP", map, 1) == 0); + ++ test_find_legacy_keymap(); + test_vconsole_convert_to_x11(); + test_x11_convert_to_vconsole(); +