[PTI-LIB] Fix Small Build Issues (#469)

* Ensure `pti_assert_test` gets enumerated and works on Windows.
* Fix build error with custom build types.
* Add wbr to sdk `.gitignore`.

Signed-off-by: Schilling, Matthew <[email protected]>

Author: mschilling0

sdk/.gitignore

@@ -8,3 +8,4 @@ venv/
 compile_commands.json
 CMakeUserPresets.json
 error_diff.txt
+wbr

sdk/cmake/Modules/FindXpti.cmake

@@ -161,7 +161,9 @@ if(Xpti_FOUND AND NOT TARGET Xpti::xpti)
         TARGET Xpti::xpti
         APPEND
         PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-      set_target_properties(Xpti::xpti PROPERTIES IMPORTED_IMPLIB_RELEASE
+      set_target_properties(Xpti::xpti PROPERTIES IMPORTED_IMPLIB
+                                                  "${Xpti_Shared_LIBRARY}"
+                                                  IMPORTED_IMPLIB_RELEASE
                                                   "${Xpti_Shared_LIBRARY}")
       if(Xpti_Shared_Runtime_LIBRARY)
         set_target_properties(
@@ -203,7 +205,8 @@ if(Xpti_FOUND AND NOT TARGET Xpti::xpti_static)
         PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
       set_target_properties(
         Xpti::xpti_static
-        PROPERTIES IMPORTED_IMPLIB_RELEASE "${Xpti_Static_LIBRARY}"
+        PROPERTIES IMPORTED_IMPLIB "${Xpti_Static_LIBRARY}"
+                   IMPORTED_IMPLIB_RELEASE "${Xpti_Static_LIBRARY}"
                    IMPORTED_LOCATION "${Xpti_Static_LIBRARY}"
                    IMPORTED_LOCATION_RELEASE "${Xpti_Static_LIBRARY}")
     endif()

sdk/test/CMakeLists.txt

@@ -434,7 +434,11 @@ add_executable(pti_assert_test pti_assert_test.cc)
 target_include_directories(pti_assert_test PUBLIC
   "${PROJECT_SOURCE_DIR}/src/utils")
 
-target_link_libraries(pti_assert_test PUBLIC GTest::gtest_main)
+target_link_libraries(pti_assert_test PUBLIC GTest::gtest_main GTest::gmock)
+
+gtest_discover_tests(
+  pti_assert_test
+  PROPERTIES LABELS "unit")
 
 gtest_discover_tests(
   view_record_test

sdk/test/pti_assert_test.cc

@@ -1,5 +1,6 @@
 #include "pti_assert.h"
 
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 TEST(PtiAssertTest, CheckCorrectAssertion) {
@@ -13,6 +14,8 @@ TEST(PtiAssertTest, CheckIncorrectAssertion) {
   const int value_1 = 0;
   const int value_2 = 1;
   EXPECT_NE(value_1, value_2);
-  EXPECT_DEATH_IF_SUPPORTED(PTI_ASSERT(value_1 == value_2), __FILE__ ":");
+  // clang-format off
+  EXPECT_DEATH_IF_SUPPORTED(PTI_ASSERT(value_1 == value_2), ::testing::HasSubstr(__FILE__ ":"));
+  // clang-format on
   PTI_ASSERT(value_1 != value_2);
 }