浏览代码

Tests: don't link `FailingBuilds` with `catch`

Benoit Blanchon 1 年之前
父节点
当前提交
20219d74f0
共有 2 个文件被更改,包括 7 次插入4 次删除
  1. 6 3
      extras/tests/CMakeLists.txt
  2. 1 1
      extras/tests/FailingBuilds/CMakeLists.txt

+ 6 - 3
extras/tests/CMakeLists.txt

@@ -5,15 +5,18 @@
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 
-add_subdirectory(catch)
+link_libraries(ArduinoJson)
 
 
-link_libraries(ArduinoJson catch)
+# Failing builds should only link with ArduinoJson, not catch
+add_subdirectory(FailingBuilds)
+
+add_subdirectory(catch)
+link_libraries(catch)
 
 
 include_directories(Helpers)
 include_directories(Helpers)
 add_subdirectory(Cpp17)
 add_subdirectory(Cpp17)
 add_subdirectory(Cpp20)
 add_subdirectory(Cpp20)
 add_subdirectory(Deprecated)
 add_subdirectory(Deprecated)
-add_subdirectory(FailingBuilds)
 add_subdirectory(IntegrationTests)
 add_subdirectory(IntegrationTests)
 add_subdirectory(JsonArray)
 add_subdirectory(JsonArray)
 add_subdirectory(JsonArrayConst)
 add_subdirectory(JsonArrayConst)

+ 1 - 1
extras/tests/FailingBuilds/CMakeLists.txt

@@ -16,7 +16,7 @@ macro(build_should_fail target)
 	set_tests_properties(${target}
 	set_tests_properties(${target}
 		PROPERTIES
 		PROPERTIES
 			WILL_FAIL TRUE
 			WILL_FAIL TRUE
-			LABELS "WillFail;Catch"
+			LABELS "WillFail"
 	)
 	)
 endmacro()
 endmacro()