diff options
author | Brad King <brad.king@kitware.com> | 2019-11-14 10:31:18 -0500 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-11-14 10:57:42 -0500 |
commit | d2e5e6ff1abec8b3b1579f122b7dcc89a35dbba4 (patch) | |
tree | 53e92d69536044321ac31d5543a6c426546b5aba | |
parent | 786954c4893565d8da27329201fd235e347e051d (diff) | |
download | cmake-d2e5e6ff1abec8b3b1579f122b7dcc89a35dbba4.tar.gz |
Tests: Organize Objective C/C++ test directories
Move them all under `Tests/ObjC` and `Tests/ObjCXX`.
-rw-r--r-- | Tests/CMakeLists.txt | 88 | ||||
-rw-r--r-- | Tests/ObjC/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/ObjC/c-file-extension-test/CMakeLists.txt (renamed from Tests/Objective-C/c-file-extension-test/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | Tests/ObjC/c-file-extension-test/main.m (renamed from Tests/Objective-C/c-file-extension-test/main.m) | 0 | ||||
-rw-r--r-- | Tests/ObjC/cxx-file-extension-test/CMakeLists.txt (renamed from Tests/Objective-C/cxx-file-extension-test/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | Tests/ObjC/cxx-file-extension-test/main.m (renamed from Tests/Objective-C/cxx-file-extension-test/main.m) | 0 | ||||
-rw-r--r-- | Tests/ObjC/objc-file-extension-test/CMakeLists.txt (renamed from Tests/Objective-C/objc-file-extension-test/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | Tests/ObjC/objc-file-extension-test/main.m (renamed from Tests/Objective-C/objc-file-extension-test/main.m) | 0 | ||||
-rw-r--r-- | Tests/ObjC/simple-build-test/CMakeLists.txt (renamed from Tests/Objective-C/simple-build-test/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | Tests/ObjC/simple-build-test/foo.h (renamed from Tests/Objective-C++/simple-build-test/foo.h) | 0 | ||||
-rw-r--r-- | Tests/ObjC/simple-build-test/foo.m (renamed from Tests/Objective-C/simple-build-test/foo.m) | 0 | ||||
-rw-r--r-- | Tests/ObjC/simple-build-test/main.m (renamed from Tests/Objective-C/simple-build-test/main.m) | 0 | ||||
-rw-r--r-- | Tests/ObjCXX/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/ObjCXX/ObjC++/CMakeLists.txt (renamed from Tests/ObjC++/CMakeLists.txt) | 1 | ||||
-rw-r--r-- | Tests/ObjCXX/ObjC++/objc++.mm (renamed from Tests/ObjC++/objc++.mm) | 0 | ||||
-rw-r--r-- | Tests/ObjCXX/cxx-file-extension-test/CMakeLists.txt (renamed from Tests/Objective-C++/cxx-file-extension-test/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | Tests/ObjCXX/cxx-file-extension-test/main.mm (renamed from Tests/Objective-C++/cxx-file-extension-test/main.mm) | 0 | ||||
-rw-r--r-- | Tests/ObjCXX/objcxx-file-extension-test/CMakeLists.txt (renamed from Tests/Objective-C++/objcxx-file-extension-test/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | Tests/ObjCXX/objcxx-file-extension-test/main.mm (renamed from Tests/Objective-C++/objcxx-file-extension-test/main.mm) | 0 | ||||
-rw-r--r-- | Tests/ObjCXX/simple-build-test/CMakeLists.txt (renamed from Tests/Objective-C++/simple-build-test/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | Tests/ObjCXX/simple-build-test/foo.h (renamed from Tests/Objective-C/simple-build-test/foo.h) | 0 | ||||
-rw-r--r-- | Tests/ObjCXX/simple-build-test/foo.mm (renamed from Tests/Objective-C++/simple-build-test/foo.mm) | 0 | ||||
-rw-r--r-- | Tests/ObjCXX/simple-build-test/main.mm (renamed from Tests/Objective-C++/simple-build-test/main.mm) | 0 |
23 files changed, 10 insertions, 87 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index b29638bafe..57fa7fcd89 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -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 () diff --git a/Tests/ObjC/CMakeLists.txt b/Tests/ObjC/CMakeLists.txt new file mode 100644 index 0000000000..ce3033c039 --- /dev/null +++ b/Tests/ObjC/CMakeLists.txt @@ -0,0 +1,4 @@ +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) diff --git a/Tests/Objective-C/c-file-extension-test/CMakeLists.txt b/Tests/ObjC/c-file-extension-test/CMakeLists.txt index e091448207..e091448207 100644 --- a/Tests/Objective-C/c-file-extension-test/CMakeLists.txt +++ b/Tests/ObjC/c-file-extension-test/CMakeLists.txt diff --git a/Tests/Objective-C/c-file-extension-test/main.m b/Tests/ObjC/c-file-extension-test/main.m index 1c159a9af7..1c159a9af7 100644 --- a/Tests/Objective-C/c-file-extension-test/main.m +++ b/Tests/ObjC/c-file-extension-test/main.m diff --git a/Tests/Objective-C/cxx-file-extension-test/CMakeLists.txt b/Tests/ObjC/cxx-file-extension-test/CMakeLists.txt index eb065e46d7..eb065e46d7 100644 --- a/Tests/Objective-C/cxx-file-extension-test/CMakeLists.txt +++ b/Tests/ObjC/cxx-file-extension-test/CMakeLists.txt diff --git a/Tests/Objective-C/cxx-file-extension-test/main.m b/Tests/ObjC/cxx-file-extension-test/main.m index 1c159a9af7..1c159a9af7 100644 --- a/Tests/Objective-C/cxx-file-extension-test/main.m +++ b/Tests/ObjC/cxx-file-extension-test/main.m diff --git a/Tests/Objective-C/objc-file-extension-test/CMakeLists.txt b/Tests/ObjC/objc-file-extension-test/CMakeLists.txt index 27e88be680..27e88be680 100644 --- a/Tests/Objective-C/objc-file-extension-test/CMakeLists.txt +++ b/Tests/ObjC/objc-file-extension-test/CMakeLists.txt diff --git a/Tests/Objective-C/objc-file-extension-test/main.m b/Tests/ObjC/objc-file-extension-test/main.m index 2ec391704e..2ec391704e 100644 --- a/Tests/Objective-C/objc-file-extension-test/main.m +++ b/Tests/ObjC/objc-file-extension-test/main.m diff --git a/Tests/Objective-C/simple-build-test/CMakeLists.txt b/Tests/ObjC/simple-build-test/CMakeLists.txt index 5ab46acd77..5ab46acd77 100644 --- a/Tests/Objective-C/simple-build-test/CMakeLists.txt +++ b/Tests/ObjC/simple-build-test/CMakeLists.txt diff --git a/Tests/Objective-C++/simple-build-test/foo.h b/Tests/ObjC/simple-build-test/foo.h index b3fb084c18..b3fb084c18 100644 --- a/Tests/Objective-C++/simple-build-test/foo.h +++ b/Tests/ObjC/simple-build-test/foo.h diff --git a/Tests/Objective-C/simple-build-test/foo.m b/Tests/ObjC/simple-build-test/foo.m index 2d452a8e50..2d452a8e50 100644 --- a/Tests/Objective-C/simple-build-test/foo.m +++ b/Tests/ObjC/simple-build-test/foo.m diff --git a/Tests/Objective-C/simple-build-test/main.m b/Tests/ObjC/simple-build-test/main.m index 970d5548e7..970d5548e7 100644 --- a/Tests/Objective-C/simple-build-test/main.m +++ b/Tests/ObjC/simple-build-test/main.m diff --git a/Tests/ObjCXX/CMakeLists.txt b/Tests/ObjCXX/CMakeLists.txt new file mode 100644 index 0000000000..a2a907a676 --- /dev/null +++ b/Tests/ObjCXX/CMakeLists.txt @@ -0,0 +1,4 @@ +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) diff --git a/Tests/ObjC++/CMakeLists.txt b/Tests/ObjCXX/ObjC++/CMakeLists.txt index 8b1563ed85..5ba5db2ed0 100644 --- a/Tests/ObjC++/CMakeLists.txt +++ b/Tests/ObjCXX/ObjC++/CMakeLists.txt @@ -3,4 +3,3 @@ project (ObjC++) add_executable (ObjC++ objc++.mm) target_link_libraries(ObjC++ "-framework Cocoa") - diff --git a/Tests/ObjC++/objc++.mm b/Tests/ObjCXX/ObjC++/objc++.mm index 258ebaa52f..258ebaa52f 100644 --- a/Tests/ObjC++/objc++.mm +++ b/Tests/ObjCXX/ObjC++/objc++.mm diff --git a/Tests/Objective-C++/cxx-file-extension-test/CMakeLists.txt b/Tests/ObjCXX/cxx-file-extension-test/CMakeLists.txt index 0b33875d9e..0b33875d9e 100644 --- a/Tests/Objective-C++/cxx-file-extension-test/CMakeLists.txt +++ b/Tests/ObjCXX/cxx-file-extension-test/CMakeLists.txt diff --git a/Tests/Objective-C++/cxx-file-extension-test/main.mm b/Tests/ObjCXX/cxx-file-extension-test/main.mm index 1c159a9af7..1c159a9af7 100644 --- a/Tests/Objective-C++/cxx-file-extension-test/main.mm +++ b/Tests/ObjCXX/cxx-file-extension-test/main.mm diff --git a/Tests/Objective-C++/objcxx-file-extension-test/CMakeLists.txt b/Tests/ObjCXX/objcxx-file-extension-test/CMakeLists.txt index eda7bbaeb9..eda7bbaeb9 100644 --- a/Tests/Objective-C++/objcxx-file-extension-test/CMakeLists.txt +++ b/Tests/ObjCXX/objcxx-file-extension-test/CMakeLists.txt diff --git a/Tests/Objective-C++/objcxx-file-extension-test/main.mm b/Tests/ObjCXX/objcxx-file-extension-test/main.mm index d4aa1bba38..d4aa1bba38 100644 --- a/Tests/Objective-C++/objcxx-file-extension-test/main.mm +++ b/Tests/ObjCXX/objcxx-file-extension-test/main.mm diff --git a/Tests/Objective-C++/simple-build-test/CMakeLists.txt b/Tests/ObjCXX/simple-build-test/CMakeLists.txt index cf276834ab..cf276834ab 100644 --- a/Tests/Objective-C++/simple-build-test/CMakeLists.txt +++ b/Tests/ObjCXX/simple-build-test/CMakeLists.txt diff --git a/Tests/Objective-C/simple-build-test/foo.h b/Tests/ObjCXX/simple-build-test/foo.h index b3fb084c18..b3fb084c18 100644 --- a/Tests/Objective-C/simple-build-test/foo.h +++ b/Tests/ObjCXX/simple-build-test/foo.h diff --git a/Tests/Objective-C++/simple-build-test/foo.mm b/Tests/ObjCXX/simple-build-test/foo.mm index 2d452a8e50..2d452a8e50 100644 --- a/Tests/Objective-C++/simple-build-test/foo.mm +++ b/Tests/ObjCXX/simple-build-test/foo.mm diff --git a/Tests/Objective-C++/simple-build-test/main.mm b/Tests/ObjCXX/simple-build-test/main.mm index 7c85551f0a..7c85551f0a 100644 --- a/Tests/Objective-C++/simple-build-test/main.mm +++ b/Tests/ObjCXX/simple-build-test/main.mm |