From bc4c2dde33412256ec371d63d1fef80a4fa9e2a0 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 12 May 2020 18:11:55 +0200 Subject: [PATCH] Moved failing builds to a dedicated folder --- extras/tests/CMakeLists.txt | 1 + extras/tests/FailingBuilds/CMakeLists.txt | 30 ++++++++++++++++++ .../{Misc => FailingBuilds}/Issue1189.cpp | 0 .../{Misc => FailingBuilds}/Issue978.cpp | 0 extras/tests/Misc/CMakeLists.txt | 31 ------------------- 5 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 extras/tests/FailingBuilds/CMakeLists.txt rename extras/tests/{Misc => FailingBuilds}/Issue1189.cpp (100%) rename extras/tests/{Misc => FailingBuilds}/Issue978.cpp (100%) diff --git a/extras/tests/CMakeLists.txt b/extras/tests/CMakeLists.txt index 09ff4122..0fce75ef 100644 --- a/extras/tests/CMakeLists.txt +++ b/extras/tests/CMakeLists.txt @@ -8,6 +8,7 @@ link_libraries(ArduinoJson catch) include_directories(Helpers) add_subdirectory(ElementProxy) +add_subdirectory(FailingBuilds) add_subdirectory(IntegrationTests) add_subdirectory(JsonArray) add_subdirectory(JsonDeserializer) diff --git a/extras/tests/FailingBuilds/CMakeLists.txt b/extras/tests/FailingBuilds/CMakeLists.txt new file mode 100644 index 00000000..590fe9c2 --- /dev/null +++ b/extras/tests/FailingBuilds/CMakeLists.txt @@ -0,0 +1,30 @@ +# ArduinoJson - arduinojson.org +# Copyright Benoit Blanchon 2014-2020 +# MIT License + +macro(build_should_fail target) + set_target_properties(${target} + PROPERTIES + EXCLUDE_FROM_ALL TRUE + EXCLUDE_FROM_DEFAULT_BUILD TRUE + ) + add_test( + NAME + ${target} + COMMAND + ${CMAKE_COMMAND} --build . --target ${target} --config $ + WORKING_DIRECTORY + ${CMAKE_BINARY_DIR} + ) + set_tests_properties(${target} + PROPERTIES + WILL_FAIL TRUE + ) +endmacro() + + +add_executable(Issue978 Issue978.cpp) +build_should_fail(Issue978) + +add_executable(Issue1189 Issue1189.cpp) +build_should_fail(Issue1189) diff --git a/extras/tests/Misc/Issue1189.cpp b/extras/tests/FailingBuilds/Issue1189.cpp similarity index 100% rename from extras/tests/Misc/Issue1189.cpp rename to extras/tests/FailingBuilds/Issue1189.cpp diff --git a/extras/tests/Misc/Issue978.cpp b/extras/tests/FailingBuilds/Issue978.cpp similarity index 100% rename from extras/tests/Misc/Issue978.cpp rename to extras/tests/FailingBuilds/Issue978.cpp diff --git a/extras/tests/Misc/CMakeLists.txt b/extras/tests/Misc/CMakeLists.txt index 28d8bbef..a983004b 100644 --- a/extras/tests/Misc/CMakeLists.txt +++ b/extras/tests/Misc/CMakeLists.txt @@ -18,34 +18,3 @@ add_executable(MiscTests set_target_properties(MiscTests PROPERTIES UNITY_BUILD OFF) add_test(Misc MiscTests) - -macro(build_should_fail target) - set_target_properties(${target} - PROPERTIES - EXCLUDE_FROM_ALL TRUE - EXCLUDE_FROM_DEFAULT_BUILD TRUE - ) - add_test( - NAME - ${target} - COMMAND - ${CMAKE_COMMAND} --build . --target ${target} --config $ - WORKING_DIRECTORY - ${CMAKE_BINARY_DIR} - ) - set_tests_properties(${target} - PROPERTIES - WILL_FAIL TRUE - ) -endmacro() - - -add_executable(Issue978 - Issue978.cpp -) -build_should_fail(Issue978) - -add_executable(Issue1189 - Issue1189.cpp -) -build_should_fail(Issue1189)