From d2e5e6ff1abec8b3b1579f122b7dcc89a35dbba4 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 14 Nov 2019 10:31:18 -0500 Subject: [PATCH] Tests: Organize Objective C/C++ test directories Move them all under `Tests/ObjC` and `Tests/ObjCXX`. --- Tests/CMakeLists.txt | 88 +------------------ Tests/ObjC/CMakeLists.txt | 4 + .../c-file-extension-test/CMakeLists.txt | 0 .../c-file-extension-test/main.m | 0 .../cxx-file-extension-test/CMakeLists.txt | 0 .../cxx-file-extension-test/main.m | 0 .../objc-file-extension-test/CMakeLists.txt | 0 .../objc-file-extension-test/main.m | 0 .../simple-build-test/CMakeLists.txt | 0 .../simple-build-test/foo.h | 0 .../simple-build-test/foo.m | 0 .../simple-build-test/main.m | 0 Tests/ObjCXX/CMakeLists.txt | 4 + Tests/{ => ObjCXX}/ObjC++/CMakeLists.txt | 1 - Tests/{ => ObjCXX}/ObjC++/objc++.mm | 0 .../cxx-file-extension-test/CMakeLists.txt | 0 .../cxx-file-extension-test/main.mm | 0 .../objcxx-file-extension-test/CMakeLists.txt | 0 .../objcxx-file-extension-test/main.mm | 0 .../simple-build-test/CMakeLists.txt | 0 .../simple-build-test/foo.h | 0 .../simple-build-test/foo.mm | 0 .../simple-build-test/main.mm | 0 23 files changed, 10 insertions(+), 87 deletions(-) create mode 100644 Tests/ObjC/CMakeLists.txt rename Tests/{Objective-C => ObjC}/c-file-extension-test/CMakeLists.txt (100%) rename Tests/{Objective-C => ObjC}/c-file-extension-test/main.m (100%) rename Tests/{Objective-C => ObjC}/cxx-file-extension-test/CMakeLists.txt (100%) rename Tests/{Objective-C => ObjC}/cxx-file-extension-test/main.m (100%) rename Tests/{Objective-C => ObjC}/objc-file-extension-test/CMakeLists.txt (100%) rename Tests/{Objective-C => ObjC}/objc-file-extension-test/main.m (100%) rename Tests/{Objective-C => ObjC}/simple-build-test/CMakeLists.txt (100%) rename Tests/{Objective-C++ => ObjC}/simple-build-test/foo.h (100%) rename Tests/{Objective-C => ObjC}/simple-build-test/foo.m (100%) rename Tests/{Objective-C => ObjC}/simple-build-test/main.m (100%) create mode 100644 Tests/ObjCXX/CMakeLists.txt rename Tests/{ => ObjCXX}/ObjC++/CMakeLists.txt (99%) rename Tests/{ => ObjCXX}/ObjC++/objc++.mm (100%) rename Tests/{Objective-C++ => ObjCXX}/cxx-file-extension-test/CMakeLists.txt (100%) rename Tests/{Objective-C++ => ObjCXX}/cxx-file-extension-test/main.mm (100%) rename Tests/{Objective-C++ => ObjCXX}/objcxx-file-extension-test/CMakeLists.txt (100%) rename Tests/{Objective-C++ => ObjCXX}/objcxx-file-extension-test/main.mm (100%) rename Tests/{Objective-C++ => ObjCXX}/simple-build-test/CMakeLists.txt (100%) rename Tests/{Objective-C => ObjCXX}/simple-build-test/foo.h (100%) rename Tests/{Objective-C++ => ObjCXX}/simple-build-test/foo.mm (100%) rename Tests/{Objective-C++ => ObjCXX}/simple-build-test/main.mm (100%) 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 similarity index 100% rename from Tests/Objective-C/c-file-extension-test/CMakeLists.txt rename to 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 similarity index 100% rename from Tests/Objective-C/c-file-extension-test/main.m rename to 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 similarity index 100% rename from Tests/Objective-C/cxx-file-extension-test/CMakeLists.txt rename to 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 similarity index 100% rename from Tests/Objective-C/cxx-file-extension-test/main.m rename to 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 similarity index 100% rename from Tests/Objective-C/objc-file-extension-test/CMakeLists.txt rename to 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 similarity index 100% rename from Tests/Objective-C/objc-file-extension-test/main.m rename to 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 similarity index 100% rename from Tests/Objective-C/simple-build-test/CMakeLists.txt rename to 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 similarity index 100% rename from Tests/Objective-C++/simple-build-test/foo.h rename to 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 similarity index 100% rename from Tests/Objective-C/simple-build-test/foo.m rename to 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 similarity index 100% rename from Tests/Objective-C/simple-build-test/main.m rename to 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 similarity index 99% rename from Tests/ObjC++/CMakeLists.txt rename to 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 similarity index 100% rename from Tests/ObjC++/objc++.mm rename to 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 similarity index 100% rename from Tests/Objective-C++/cxx-file-extension-test/CMakeLists.txt rename to 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 similarity index 100% rename from Tests/Objective-C++/cxx-file-extension-test/main.mm rename to 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 similarity index 100% rename from Tests/Objective-C++/objcxx-file-extension-test/CMakeLists.txt rename to 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 similarity index 100% rename from Tests/Objective-C++/objcxx-file-extension-test/main.mm rename to 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 similarity index 100% rename from Tests/Objective-C++/simple-build-test/CMakeLists.txt rename to 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 similarity index 100% rename from Tests/Objective-C/simple-build-test/foo.h rename to 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 similarity index 100% rename from Tests/Objective-C++/simple-build-test/foo.mm rename to 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 similarity index 100% rename from Tests/Objective-C++/simple-build-test/main.mm rename to Tests/ObjCXX/simple-build-test/main.mm