diff options
| author | Franck Bui <fbui@suse.com> | 2023-04-20 09:47:35 +0200 |
|---|---|---|
| committer | Franck Bui <fbui@suse.com> | 2023-04-26 08:15:17 +0200 |
| commit | b35f71ac1a8b8669cf399711a0396d78581b89eb (patch) | |
| tree | 1e8452b70a66ca270eed53f1ec3aca97c374bea5 /test | |
| parent | c821ad7d607b21e807c56d9fa8843821c0fd383e (diff) | |
| download | systemd-b35f71ac1a8b8669cf399711a0396d78581b89eb.tar.gz | |
locale: when no xvariant match select the entry with an empty xvariant
When doing a conversion and the specified 'xc->xvariant' has no match, select
the x11 layout entry with a matching layout and an empty xvariant if such entry
exists. It's still better than no conversion at all.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/units/testsuite-73.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/units/testsuite-73.sh b/test/units/testsuite-73.sh index e5ac09c2e3..56000b96d2 100755 --- a/test/units/testsuite-73.sh +++ b/test/units/testsuite-73.sh @@ -273,15 +273,15 @@ test_vc_keymap() { assert_in "XKBVARIANT=intl" "$vc" assert_in "XKBOPTIONS=terminate:ctrl_alt_bksp" "$vc" elif [[ "$i" =~ ^us-.* ]]; then - assert_in "X11 Layout: .unset." "$output" - assert_not_in "X11 Model:" "$output" - assert_not_in "X11 Variant:" "$output" - assert_not_in "X11 Options:" "$output" + assert_in "X11 Layout: us" "$output" + assert_in "X11 Model: microsoftpro" "$output" + assert_in "X11 Variant:" "$output" + assert_in "X11 Options: terminate:ctrl_alt_bksp" "$output" - assert_not_in "XKBLAYOUT" "$vc" - assert_not_in "XKBMODEL" "$vc" - assert_not_in "XKBVARIANT" "$vc" - assert_not_in "XKBOPTIONS" "$vc" + assert_in "XKBLAYOUT=us" "$vc" + assert_in "XKBMODEL=microsoftpro" "$vc" + assert_in "XKBVARIANT=" "$vc" + assert_in "XKBOPTIONS=terminate:ctrl_alt_bksp" "$vc" fi done |