hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix cpp-utils-test on 32bit Windows

Browse Source
This commit is contained in:
Sebastian Messmer 2018-09-19 03:01:31 -07:00
parent 770de9f239
commit 56ffe708e2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeSettings.json
View File

@ -7,7 +7,7 @@
"inheritEnvironments": [ "msvc_x86" ],
"buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
"cmakeCommandArgs": "-DBUILD_TESTING=off -DBOOST_ROOT=C:\\local\\boost_1_68_0 -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\DokanLibrary-1.1.0\"",
"cmakeCommandArgs": "-DBUILD_TESTING=on -DBOOST_ROOT=C:\\local\\boost_1_68_0 -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\DokanLibrary-1.1.0\"",
"buildCommandArgs": "-v",
"ctestCommandArgs": ""
},
@ -18,7 +18,7 @@
"inheritEnvironments": [ "msvc_x86" ],
"buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
"cmakeCommandArgs": "-DBUILD_TESTING=off -DBOOST_ROOT=C:\\local\\boost_1_68_0 -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\DokanLibrary-1.1.0\"",
"cmakeCommandArgs": "-DBUILD_TESTING=on -DBOOST_ROOT=C:\\local\\boost_1_68_0 -DDOKAN_PATH=\"C:\\Program Files\\Dokan\\DokanLibrary-1.1.0\"",
"buildCommandArgs": "-v",
"ctestCommandArgs": ""
},

2
test/cpp-utils/assert/assert_debug_test.cpp
View File

@ -32,6 +32,6 @@ constexpr const char* EXPECTED = R"(Assertion \[2==5\] failed in .*assert_debug_
TEST(AssertTest_DebugBuild, AssertMessageContainsBacktrace) {
EXPECT_DEATH(
ASSERT(2==5, "my message"),
"cpputils::backtrace"
"cpputils::"
);
}

2
test/cpp-utils/assert/assert_release_test.cpp
View File

@ -42,7 +42,7 @@ TEST(AssertTest_ReleaseBuild, AssertMessageContainsBacktrace) {
FAIL();
} catch (const cpputils::AssertFailed &e) {
EXPECT_THAT(e.what(), HasSubstr(
"cpputils::backtrace"
"cpputils::"
));
}
}

4
test/cpp-utils/assert/backtrace_test.cpp
View File

@ -136,7 +136,7 @@ TEST(BacktraceTest, ShowBacktraceOnUnhandledException_ShowsCorrectExceptionMessa
#if defined(_MSC_VER)
TEST(BacktraceTest, UnknownCode_ShowsCorrectSignalName) {
auto output = call_process_exiting_with_code(0x12345678);
EXPECT_THAT(output, HasSubstr("UNKNOWN_CODE(0x12345678)"));
auto output = call_process_exiting_with_code(0x1234567);
EXPECT_THAT(output, HasSubstr("UNKNOWN_CODE(0x1234567)"));
}
#endif