diff options
author | yangmingtai <961612727@qq.com> | 2022-01-11 20:22:11 +0800 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-01-12 05:06:05 +0900 |
commit | 647082cf7f07a87c65601626e86c3ed9f78fb387 (patch) | |
tree | 46e39f081348575f766afbf76a1c7c6fa7979068 /src/test/test-string-util.c | |
parent | d5f8fd5b00e938710b5e80396f8b3fab59dd6d00 (diff) | |
download | systemd-647082cf7f07a87c65601626e86c3ed9f78fb387.tar.gz |
fix test-string-util failed when locale is not utf8
Diffstat (limited to 'src/test/test-string-util.c')
-rw-r--r-- | src/test/test-string-util.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c index 57cd03e4e2..071b391361 100644 --- a/src/test/test-string-util.c +++ b/src/test/test-string-util.c @@ -166,33 +166,33 @@ TEST(cellescape) { assert_se(streq(cellescape(buf, 1, "\020"), "")); assert_se(streq(cellescape(buf, 2, "\020"), ".")); assert_se(streq(cellescape(buf, 3, "\020"), "..")); - assert_se(streq(cellescape(buf, 4, "\020"), "…")); + assert_se(streq(cellescape(buf, 4, "\020"), is_locale_utf8() ? "…" : "...")); assert_se(streq(cellescape(buf, 5, "\020"), "\\020")); - assert_se(streq(cellescape(buf, 5, "1234\020"), "1…")); - assert_se(streq(cellescape(buf, 6, "1234\020"), "12…")); - assert_se(streq(cellescape(buf, 7, "1234\020"), "123…")); - assert_se(streq(cellescape(buf, 8, "1234\020"), "1234…")); + assert_se(streq(cellescape(buf, 5, "1234\020"), is_locale_utf8() ? "1…" : "1...")); + assert_se(streq(cellescape(buf, 6, "1234\020"), is_locale_utf8() ? "12…" : "12...")); + assert_se(streq(cellescape(buf, 7, "1234\020"), is_locale_utf8() ? "123…" : "123...")); + assert_se(streq(cellescape(buf, 8, "1234\020"), is_locale_utf8() ? "1234…" : "1234...")); assert_se(streq(cellescape(buf, 9, "1234\020"), "1234\\020")); assert_se(streq(cellescape(buf, 1, "\t\n"), "")); assert_se(streq(cellescape(buf, 2, "\t\n"), ".")); assert_se(streq(cellescape(buf, 3, "\t\n"), "..")); - assert_se(streq(cellescape(buf, 4, "\t\n"), "…")); + assert_se(streq(cellescape(buf, 4, "\t\n"), is_locale_utf8() ? "…" : "...")); assert_se(streq(cellescape(buf, 5, "\t\n"), "\\t\\n")); - assert_se(streq(cellescape(buf, 5, "1234\t\n"), "1…")); - assert_se(streq(cellescape(buf, 6, "1234\t\n"), "12…")); - assert_se(streq(cellescape(buf, 7, "1234\t\n"), "123…")); - assert_se(streq(cellescape(buf, 8, "1234\t\n"), "1234…")); + assert_se(streq(cellescape(buf, 5, "1234\t\n"), is_locale_utf8() ? "1…" : "1...")); + assert_se(streq(cellescape(buf, 6, "1234\t\n"), is_locale_utf8() ? "12…" : "12...")); + assert_se(streq(cellescape(buf, 7, "1234\t\n"), is_locale_utf8() ? "123…" : "123...")); + assert_se(streq(cellescape(buf, 8, "1234\t\n"), is_locale_utf8() ? "1234…" : "1234...")); assert_se(streq(cellescape(buf, 9, "1234\t\n"), "1234\\t\\n")); - assert_se(streq(cellescape(buf, 4, "x\t\020\n"), "…")); - assert_se(streq(cellescape(buf, 5, "x\t\020\n"), "x…")); - assert_se(streq(cellescape(buf, 6, "x\t\020\n"), "x…")); - assert_se(streq(cellescape(buf, 7, "x\t\020\n"), "x\\t…")); - assert_se(streq(cellescape(buf, 8, "x\t\020\n"), "x\\t…")); - assert_se(streq(cellescape(buf, 9, "x\t\020\n"), "x\\t…")); + assert_se(streq(cellescape(buf, 4, "x\t\020\n"), is_locale_utf8() ? "…" : "...")); + assert_se(streq(cellescape(buf, 5, "x\t\020\n"), is_locale_utf8() ? "x…" : "x...")); + assert_se(streq(cellescape(buf, 6, "x\t\020\n"), is_locale_utf8() ? "x…" : "x...")); + assert_se(streq(cellescape(buf, 7, "x\t\020\n"), is_locale_utf8() ? "x\\t…" : "x\\t...")); + assert_se(streq(cellescape(buf, 8, "x\t\020\n"), is_locale_utf8() ? "x\\t…" : "x\\t...")); + assert_se(streq(cellescape(buf, 9, "x\t\020\n"), is_locale_utf8() ? "x\\t…" : "x\\t...")); assert_se(streq(cellescape(buf, 10, "x\t\020\n"), "x\\t\\020\\n")); assert_se(streq(cellescape(buf, 6, "1\011"), "1\\t")); |