diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 099cbdf3..df93a7ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,13 +100,13 @@ jobs: language-pack-el \ language-pack-tr \ libicu-dev \ - g++-8 + g++-10 - name: Run CMake run: | mkdir build cd build - export CXX="g++-8" CC="gcc-8" + export CXX="g++-10" CC="gcc-10" cmake .. -DBOOST_ROOT="boost_1_78_0" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" make all diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14fe7663..eb7d4a8d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,13 +67,13 @@ jobs: language-pack-el \ language-pack-tr \ libicu-dev \ - g++-8 + g++-10 - name: Run CMake run: | mkdir build cd build - export CXX="g++-8" CC="gcc-8" + export CXX="g++-10" CC="gcc-10" cmake .. -DBOOST_ROOT="boost_1_78_0" -DCPACK_PACKAGE_VERSION="${{ needs.create_release.outputs.git_tag }}" make all diff --git a/src/tests/api/internals/main.cpp b/src/tests/api/internals/main.cpp index 98171cf9..fcb998ad 100644 --- a/src/tests/api/internals/main.cpp +++ b/src/tests/api/internals/main.cpp @@ -116,21 +116,6 @@ TEST(Filesystem, pathStringConstructorUsesNativeEncodingOfUtf8) { EXPECT_EQ(utf8, path.u8string()); EXPECT_EQ(utf16, path.u16string()); } - -TEST(Filesystem, - pathStringAndLocaleConstructorUsesNativeEncodingOfUtf8WithCUtf8Locale) { - std::string utf8 = u8"Andr\u00E9_settings.toml"; - std::u16string utf16 = u"Andr\u00E9_settings.toml"; - - ASSERT_EQ('\xc3', utf8[4]); - ASSERT_EQ('\xa9', utf8[5]); - - std::filesystem::path path(utf8, std::locale("C.UTF-8")); - - EXPECT_EQ(utf8, path.string()); - EXPECT_EQ(utf8, path.u8string()); - EXPECT_EQ(utf16, path.u16string()); -} #endif TEST(Filesystem, u8pathConvertsCharacterEncodingFromUtf8ToNative) {