Skip to content

Revert "[test] Split TestFoundation in smaller tests for CTest reporting." #2611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Revert "[test] Split TestFoundation in smaller tests for CTest reporting." #2611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ find_package(dispatch CONFIG REQUIRED)

include(SwiftSupport)
include(GNUInstallDirs)
include(XCTest)

set(CF_DEPLOYMENT_SWIFT YES CACHE BOOL "Build for Swift" FORCE)

Expand Down
12 changes: 5 additions & 7 deletions TestFoundation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,9 @@ add_custom_command(TARGET TestFoundation POST_BUILD
COMMAND
${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:FoundationXML> ${CMAKE_BINARY_DIR}/TestFoundation.app)

xctest_discover_tests(TestFoundation
COMMAND
${CMAKE_BINARY_DIR}/TestFoundation.app/TestFoundation${CMAKE_EXECUTABLE_SUFFIX}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/TestFoundation.app
PROPERTIES
ENVIRONMENT
LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/TestFoundation.app:$<TARGET_LINKER_FILE_DIR:XCTest>:$<TARGET_LINKER_FILE_DIR:dispatch>:$<TARGET_LINKER_FILE_DIR:swiftDispatch>:$<TARGET_LINKER_FILE_DIR:BlocksRuntime>)
add_test(NAME TestFoundation
COMMAND ${CMAKE_BINARY_DIR}/TestFoundation.app/TestFoundation
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/TestFoundation.app)
set_tests_properties(TestFoundation PROPERTIES
ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/TestFoundation.app:$<TARGET_LINKER_FILE_DIR:XCTest>:$<TARGET_LINKER_FILE_DIR:dispatch>:$<TARGET_LINKER_FILE_DIR:swiftDispatch>:$<TARGET_LINKER_FILE_DIR:BlocksRuntime>)

100 changes: 0 additions & 100 deletions cmake/modules/XCTest.cmake
View file
Open in desktop

This file was deleted.

90 changes: 0 additions & 90 deletions cmake/modules/XCTestAddTests.cmake
View file
Open in desktop

This file was deleted.