Commit d2e5e6ff authored by Brad King's avatar Brad King
Browse files

Tests: Organize Objective C/C++ test directories

Move them all under `Tests/ObjC` and `Tests/ObjCXX`.
parent 786954c4
Pipeline #151415 failed with stage
......@@ -2327,92 +2327,8 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH
-P ${CMake_SOURCE_DIR}/Tests/CFBundleTest/VerifyResult.cmake)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/CFBundleTest")
ADD_TEST_MACRO(ObjC++ ObjC++)
add_test(Objective-C.simple-build-test ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Objective-C/simple-build-test"
"${CMake_BINARY_DIR}/Tests/Objective-C/simple-build-test"
--build-two-config
${build_generator_args}
--build-project simple-build-test
--build-options ${build_options}
--test-command simple-build-test
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Objective-C/simple-build-test")
add_test(Objective-C.c-file-extension-test ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Objective-C/c-file-extension-test"
"${CMake_BINARY_DIR}/Tests/Objective-C/c-file-extension-test"
--build-two-config
${build_generator_args}
--build-project c-file-extension-test
--build-options ${build_options}
--test-command c-file-extension-test
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Objective-C/c-file-extension-test")
add_test(Objective-C.cxx-file-extension-test ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Objective-C/cxx-file-extension-test"
"${CMake_BINARY_DIR}/Tests/Objective-C/cxx-file-extension-test"
--build-two-config
${build_generator_args}
--build-project cxx-file-extension-test
--build-options ${build_options}
--test-command cxx-file-extension-test
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Objective-C/cxx-file-extension-test")
add_test(Objective-C.objc-file-extension-test ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Objective-C/objc-file-extension-test"
"${CMake_BINARY_DIR}/Tests/Objective-C/objc-file-extension-test"
--build-two-config
${build_generator_args}
--build-project objc-file-extension-test
--build-options ${build_options}
--test-command objc-file-extension-test
)
list(APPEND TEST_BUILD_DIRS "${CMAKE_BINARY_DIR}/Tests/Objective-C/objc-file-extension-test")
add_test(Objective-CXX.simple-build-test ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Objective-C++/simple-build-test"
"${CMake_BINARY_DIR}/Tests/Objective-C++/simple-build-test"
--build-two-config
${build_generator_args}
--build-project simple-build-test
--build-options ${build_options}
--test-command simple-build-test
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Objective-C++/simple-build-test")
add_test(Objective-CXX.cxx-file-extension-test ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Objective-C++/cxx-file-extension-test"
"${CMake_BINARY_DIR}/Tests/Objective-C++/cxx-file-extension-test"
--build-two-config
${build_generator_args}
--build-project cxx-file-extension-test
--build-options ${build_options}
--test-command cxx-file-extension-test
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Objective-C++/cxx-file-extension-test")
add_test(Objective-CXX.objcxx-file-extension-test ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Objective-C++/objcxx-file-extension-test"
"${CMake_BINARY_DIR}/Tests/Objective-C++/objcxx-file-extension-test"
--build-two-config
${build_generator_args}
--build-project objcxx-file-extension-test
--build-options ${build_options}
--test-command objcxx-file-extension-test
)
list(APPEND TEST_BUILD_DIRS "${CMAKE_BINARY_DIR}/Tests/Objective-C++/objcxx-file-extension-test")
add_subdirectory(ObjC)
add_subdirectory(ObjCXX)
endif ()
endif ()
......
ADD_TEST_MACRO(ObjC.simple-build-test simple-build-test)
ADD_TEST_MACRO(ObjC.c-file-extension-test c-file-extension-test)
ADD_TEST_MACRO(ObjC.cxx-file-extension-test cxx-file-extension-test)
ADD_TEST_MACRO(ObjC.objc-file-extension-test objc-file-extension-test)
ADD_TEST_MACRO(ObjCXX.ObjC++ ObjC++)
ADD_TEST_MACRO(ObjCXX.simple-build-test simple-build-test)
ADD_TEST_MACRO(ObjCXX.cxx-file-extension-test cxx-file-extension-test)
ADD_TEST_MACRO(ObjCXX.objcxx-file-extension-test objcxx-file-extension-test)
......@@ -3,4 +3,3 @@ project (ObjC++)
add_executable (ObjC++ objc++.mm)
target_link_libraries(ObjC++ "-framework Cocoa")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment