Skip to content

Conversation

@shajrawi
Copy link

We default Swift tests to use the just-built libraries
See radars rdar://problem/35163663 and rdar://problem/42176864

@shajrawi shajrawi requested a review from shahmishal March 26, 2019 23:52
@shajrawi
Copy link
Author

@shahmishal Can you please review?

@shajrawi shajrawi force-pushed the testing_os branch 2 times, most recently from 07fa00c to 0134861 Compare March 27, 2019 05:06
@shajrawi
Copy link
Author

@swift-ci Please test

@swiftlang swiftlang deleted a comment from swift-ci Mar 27, 2019
@swiftlang swiftlang deleted a comment from swift-ci Mar 27, 2019
@swiftlang swiftlang deleted a comment from swift-ci Mar 27, 2019
test/lit.cfg Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't quite get this part. For remote runs, you'd have to not provide REMOTE_RUN_CHILD_DYLD_LIBRARY_PATH to get it to use the OS libraries, right?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For remote runs, REMOTE_RUN_CHILD_DYLD_LIBRARY_PATH is all that matters - you can choose between the OS libraries and the just-built libraries by passing a different remote_tmp_dir parameter - you get to choose between the two options today. this new PR is for supporting said choice on a local target

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not correct. remote_tmp_dir is for uploads; you can't set it to /usr/lib/swift and have things work out. You'll need to honor this new option there too.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, you're right, updated the PR accordingly.

@shajrawi
Copy link
Author

Changed the PR to have the just-built libraries in the DYLD_LIBRARY_PATH even when running with OS libraries based on @shahmishal 's review

@shajrawi shajrawi force-pushed the testing_os branch 2 times, most recently from c1f576e to 54254d0 Compare March 27, 2019 17:55
@shajrawi
Copy link
Author

@swift-ci Please smoke test

Copy link
Contributor

@jrose-apple jrose-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

test/lit.cfg Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some tabs snuck in here.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops - accidentally missed the branch up when trying to fix the tab - sorry - will re-open a PR

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants