Skip to content

Commit 4b438d5

Browse files
committed
[Test] Fix remote-run of objc_implementation_objc_client.m, again.
The previous fix wasn't quite good enough, as the framework didn't get copied to the remote device. Pass the framework as a command-line argument to the test executable so that remote-run copies it. rdar://134406720
1 parent 350c1ce commit 4b438d5

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

test/Interpreter/objc_implementation_objc_client.m

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
//
22
// Build objc_implementation.framework
33
//
4-
// RUN: %empty-directory(%t-frameworks)
5-
// RUN: %empty-directory(%t-frameworks/objc_implementation.framework/Modules/objc_implementation.swiftmodule)
6-
// RUN: %empty-directory(%t-frameworks/objc_implementation.framework/Headers)
7-
// RUN: cp %S/Inputs/objc_implementation.modulemap %t-frameworks/objc_implementation.framework/Modules/module.modulemap
8-
// RUN: cp %S/Inputs/objc_implementation.h %t-frameworks/objc_implementation.framework/Headers
9-
// RUN: %target-build-swift-dylib(%t-frameworks/objc_implementation.framework/objc_implementation) -emit-module-path %t-frameworks/objc_implementation.framework/Modules/objc_implementation.swiftmodule/%module-target-triple.swiftmodule -module-name objc_implementation -F %t-frameworks -import-underlying-module -Xlinker -install_name -Xlinker @executable_path/../$(basename %t)-frameworks/objc_implementation.framework/objc_implementation %S/objc_implementation.swift -enable-experimental-feature CImplementation -target %target-stable-abi-triple
4+
// RUN: %empty-directory(%t)
5+
// RUN: %empty-directory(%t/objc_implementation.framework/Modules/objc_implementation.swiftmodule)
6+
// RUN: %empty-directory(%t/objc_implementation.framework/Headers)
7+
// RUN: cp %S/Inputs/objc_implementation.modulemap %t/objc_implementation.framework/Modules/module.modulemap
8+
// RUN: cp %S/Inputs/objc_implementation.h %t/objc_implementation.framework/Headers
9+
// RUN: %target-build-swift-dylib(%t/objc_implementation.framework/objc_implementation) -emit-module-path %t/objc_implementation.framework/Modules/objc_implementation.swiftmodule/%module-target-triple.swiftmodule -module-name objc_implementation -F %t -import-underlying-module -Xlinker -install_name -Xlinker @executable_path/objc_implementation.framework/objc_implementation %S/objc_implementation.swift -enable-experimental-feature CImplementation -target %target-stable-abi-triple
1010

1111
//
1212
// Execute this file
1313
//
14-
// RUN: %empty-directory(%t)
15-
// RUN: %target-clang %s -isysroot %sdk -F %t-frameworks -lobjc -fmodules -fobjc-arc -o %t/objc_implementation_objc_client
14+
// RUN: %target-clang %s -isysroot %sdk -F %t -lobjc -fmodules -fobjc-arc -o %t/objc_implementation_objc_client
1615
// RUN: %target-codesign %t/objc_implementation_objc_client
17-
// RUN: %target-run %t/objc_implementation_objc_client 2>&1 | %FileCheck %s
16+
// Note: we pass the .framework as an argument so that remote-run will copy it across when running tests remotely.
17+
// RUN: %target-run %t/objc_implementation_objc_client %t/objc_implementation.framework 2>&1 | %FileCheck %s
1818

1919
// REQUIRES: executable_test
2020
// REQUIRES: objc_interop

0 commit comments

Comments
 (0)