Merge remote-tracking branch 'origin/develop' into feature/empty_name…

…_assert
srz-zumix · Aug 22, 2020 · 36e24a3 · 36e24a3
2 parents 6ac6a12 + 71c017c
commit 36e24a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/test/invalid_both_suite_and_case_setup_tests.cpp b/test/invalid_both_suite_and_case_setup_tests.cpp
@@ -19,7 +19,7 @@
 #include "iutest.hpp"
 
 #if !defined(IUTEST_USE_GTEST)
-#  if IUTEST_HAS_TESTSUITE && IUTEST_HAS_TESTCASE
+#  if IUTEST_HAS_TESTSUITE && IUTEST_HAS_TESTCASE && !defined(IUTEST_USE_LIB)
 #    define HAS_INVALID_TESTSUITE_AND_TESTCASE  1
 #  endif
 #endif

diff --git a/test/invalid_both_suite_and_case_teardown_tests.cpp b/test/invalid_both_suite_and_case_teardown_tests.cpp
@@ -19,7 +19,7 @@
 #include "iutest.hpp"
 
 #if !defined(IUTEST_USE_GTEST)
-#  if IUTEST_HAS_TESTSUITE && IUTEST_HAS_TESTCASE
+#  if IUTEST_HAS_TESTSUITE && IUTEST_HAS_TESTCASE && !defined(IUTEST_USE_LIB)
 #    define HAS_INVALID_TESTSUITE_AND_TESTCASE  1
 #  endif
 #endif