Stop using GoogleTest's SUCCEED given latest MSVC errors

See: google/googletest#4556 Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
sourcemeta · Jun 7, 2024 · 68d7489 · 68d7489
1 parent e17f55e
commit 68d7489
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/cmake/CompilerOptions.cmake b/cmake/CompilerOptions.cmake
@@ -8,6 +8,10 @@ function(sourcemeta_jsontoolkit_add_compile_options target)
       /WL
       /MP
       /sdl)
+
+    if(BUILD_SHARED_LIBS)
+      target_compile_options("${target}" PRIVATE /MT)
+    endif()
   else()
     target_compile_options("${target}" PRIVATE
       -Wall

diff --git a/test/json/json_parse_error_test.cc b/test/json/json_parse_error_test.cc
@@ -11,7 +11,6 @@
   } catch (const sourcemeta::jsontoolkit::ParseError &error) {                 \
     EXPECT_EQ(error.line(), expected_line);                                    \
     EXPECT_EQ(error.column(), expected_column);                                \
-    SUCCEED();                                                                 \
   } catch (const std::exception &) {                                           \
     FAIL() << "The parse function was expected to throw a parse error";        \
   }

diff --git a/test/json/jsontestsuite.cc b/test/json/jsontestsuite.cc
@@ -41,7 +41,11 @@ class JSONTest : public testing::Test {
           sourcemeta::jsontoolkit::parse(stream);
         }
       } catch (const sourcemeta::jsontoolkit::ParseError &) {
+        // As SUCCEED() is broken on MSVC
+        // See https://github.com/google/googletest/issues/4556
+#if !defined(_MSC_VER)
         SUCCEED();
+#endif
       } catch (const std::exception &) {
         FAIL() << "The parse function threw an unexpected error";
       }

diff --git a/test/jsonl/jsonl_parse_error_test.cc b/test/jsonl/jsonl_parse_error_test.cc
@@ -15,7 +15,6 @@
   } catch (const sourcemeta::jsontoolkit::ParseError &error) {                 \
     EXPECT_EQ(error.line(), expected_line);                                    \
     EXPECT_EQ(error.column(), expected_column);                                \
-    SUCCEED();                                                                 \
   } catch (const std::exception &) {                                           \
     FAIL() << "The JSONL parser was expected to throw a parse error";          \
   }

diff --git a/test/jsonpointer/jsonpointer_parse_error_test.cc b/test/jsonpointer/jsonpointer_parse_error_test.cc
@@ -13,7 +13,7 @@
     sourcemeta::jsontoolkit::parse(stream.str());                              \
     FAIL() << "The parse function was expected to throw";                      \
   } catch (const sourcemeta::jsontoolkit::ParseError &) {                      \
-    SUCCEED();                                                                 \
+    EXPECT_TRUE(true);                                                         \
   } catch (const std::exception &) {                                           \
     FAIL() << "The parse operation threw an unexpected error";                 \
   }
@@ -24,7 +24,6 @@
     FAIL() << "The to_pointer function was expected to throw";                 \
   } catch (const sourcemeta::jsontoolkit::PointerParseError &error) {          \
     EXPECT_EQ(error.column(), expected_column);                                \
-    SUCCEED();                                                                 \
   } catch (const std::exception &) {                                           \
     FAIL() << "The to_pointer function threw an unexpected error";             \
   }