From 2dec7326781f3bb311229a00119e657b5dca4de5 Mon Sep 17 00:00:00 2001 From: Vladislav Shchapov Date: Mon, 13 Jun 2022 12:36:51 +0500 Subject: [PATCH] Remove /source-charset:utf-8 compile option. Signed-off-by: Vladislav Shchapov --- test/CMakeLists.txt | 3 --- test/std-test.cc | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 34a693ea2492..6cdb7ac42fa0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -78,9 +78,6 @@ add_fmt_test(printf-test) add_fmt_test(ranges-test ranges-odr-test.cc) add_fmt_test(scan-test) add_fmt_test(std-test) -if (MSVC) - target_compile_options(std-test PRIVATE /source-charset:utf-8) -endif () add_fmt_test(unicode-test HEADER_ONLY) if (MSVC) target_compile_options(unicode-test PRIVATE /utf-8) diff --git a/test/std-test.cc b/test/std-test.cc index 257c8acd9c1a..12d532b27538 100644 --- a/test/std-test.cc +++ b/test/std-test.cc @@ -16,7 +16,11 @@ TEST(std_test, path) { "\"foo\\\"bar.txt\""); # ifdef _WIN32 - EXPECT_EQ(fmt::format("{}", std::filesystem::path(L"Файл.txt")), + // File.txt in Russian. + // Do not use utf-8 encoded chars in this file. + const wchar_t unicode_path[] = {0x424, 0x430, 0x439, 0x43b, 0x2e, + 0x74, 0x78, 0x74, 0}; + EXPECT_EQ(fmt::format("{}", std::filesystem::path(unicode_path)), "\"\xd0\xa4\xd0\xb0\xd0\xb9\xd0\xbb.txt\""); # endif #endif