Skip to content

Commit 53495a4

Browse files
committed
Update XCTest config for upstream changes on the CI
1 parent 6a163fd commit 53495a4

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

swift-android-testing-trunk.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
diff --git a/swift-corelibs-xctest/cmake/modules/PlatformInfo.cmake b/swift-corelibs-xctest/cmake/modules/PlatformInfo.cmake
2+
index 468dc61..a90ae3d 100644
3+
--- a/swift-corelibs-xctest/cmake/modules/PlatformInfo.cmake
4+
+++ b/swift-corelibs-xctest/cmake/modules/PlatformInfo.cmake
5+
@@ -2,6 +2,10 @@
6+
set(print_target_info_invocation "${CMAKE_Swift_COMPILER}" -print-target-info)
7+
if(CMAKE_Swift_COMPILER_TARGET)
8+
list(APPEND print_target_info_invocation -target ${CMAKE_Swift_COMPILER_TARGET})
9+
+else()
10+
+ set(arg_list ${CMAKE_Swift_FLAGS})
11+
+ separate_arguments(arg_list)
12+
+ list(APPEND print_target_info_invocation ${arg_list})
13+
endif()
14+
execute_process(COMMAND ${print_target_info_invocation} OUTPUT_VARIABLE target_info_json)
15+
message(CONFIGURE_LOG "Swift Target Info: ${print_target_info_invocation}\n"
116
diff --git a/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift b/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
217
index 78227e3..e0db2e9 100644
318
--- a/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift

0 commit comments

Comments
 (0)