From 56ffe708e27a22262e4ba4a5e9f59891b37668c2 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <messmer@cryfs.org>
Date: Wed, 19 Sep 2018 03:01:31 -0700
Subject: [PATCH] Fix cpp-utils-test on 32bit Windows

---
 CMakeSettings.json                            | 4 ++--
 test/cpp-utils/assert/assert_debug_test.cpp   | 2 +-
 test/cpp-utils/assert/assert_release_test.cpp | 2 +-
 test/cpp-utils/assert/backtrace_test.cpp      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeSettings.json b/CMakeSettings.json
index 787b4237..626d3acc 100644
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@@ -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": ""
     },
diff --git a/test/cpp-utils/assert/assert_debug_test.cpp b/test/cpp-utils/assert/assert_debug_test.cpp
index f366df1b..97c60268 100644
--- a/test/cpp-utils/assert/assert_debug_test.cpp
+++ b/test/cpp-utils/assert/assert_debug_test.cpp
@@ -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::"
     );
 }
diff --git a/test/cpp-utils/assert/assert_release_test.cpp b/test/cpp-utils/assert/assert_release_test.cpp
index 4d094ede..aa76a6be 100644
--- a/test/cpp-utils/assert/assert_release_test.cpp
+++ b/test/cpp-utils/assert/assert_release_test.cpp
@@ -42,7 +42,7 @@ TEST(AssertTest_ReleaseBuild, AssertMessageContainsBacktrace) {
     FAIL();
   } catch (const cpputils::AssertFailed &e) {
     EXPECT_THAT(e.what(), HasSubstr(
-            "cpputils::backtrace"
+            "cpputils::"
     ));
   }
 }
diff --git a/test/cpp-utils/assert/backtrace_test.cpp b/test/cpp-utils/assert/backtrace_test.cpp
index 9660a9bf..deb77c14 100644
--- a/test/cpp-utils/assert/backtrace_test.cpp
+++ b/test/cpp-utils/assert/backtrace_test.cpp
@@ -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