Skip to content

[pull] swiftwasm-release/5.3 from release/5.3 #283

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.

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

Merged
merged 2 commits into from
Sep 17, 2020

Conversation

pull[bot]
Copy link

@pull pull bot commented Sep 17, 2020

See Commits and Changes for more details.


Created by pull[bot]. Want to support this open source service? Please star it : )

neonichu and others added 2 commits September 17, 2020 12:38
(cherry picked from commit 9c8b37c)

rdar://problem/67948987
…iftlang#2817) (swiftlang#2905)

* SR-12912
Setting the path for Bundle.module fails in the case where the bundle is accessed during tests.
This uses the already derived bundlePath instead.

* Only use bundlePath when building a testTarget

* Updating this for discussion in PR. This hardcodes the test path as expected, however, when the target under test accesses Bundle.module, it fails for the same reason as before

* This prefers Bundle.main, but if it is inaccessible it falls back to the build output directory path.

* Cleaned up changes in BuildPlan.swift
Added passing integration test into TestToolTests.swift
Added failing integration test into BasicTests.swift

* Remove integration test from TestToolTests.swift

* Only instantiate Bundle for buildPath if main bundle is not found

Co-authored-by: Steven Sherry <[email protected]>
@pull pull bot merged commit 8a51218 into swiftwasm-release/5.3 Sep 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants