Skip to content

[build-script][test] Remove hard-coded install prefix of /usr and pass it in instead #75

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

Jump to bottom
Merged
shahmishal merged 1 commit into from
Apr 20, 2020
Merged

[build-script][test] Remove hard-coded install prefix of /usr and pass it in instead #75

shahmishal merged 1 commit into from
Apr 20, 2020

Conversation

@finagolfin
Copy link
Member

@finagolfin finagolfin commented Mar 22, 2020

Because of a bug upstream in the main build-script, the install prefix set by the user wasn't being passed in to this repo and these files assumed it to be /usr. This pull removes that assumption and has the main build-script pass an install prefix appended to the toolchain path instead, swiftlang/swift#30565.

@finagolfin finagolfin mentioned this pull request Mar 22, 2020
Merged
benlangmuir
benlangmuir reviewed Mar 23, 2020
View reviewed changes
@benlangmuir
Copy link
Contributor

benlangmuir commented Mar 23, 2020

swiftlang/swift#30565
@swift-ci please test

@finagolfin
Copy link
Member Author

finagolfin commented Mar 23, 2020

Looks like I missed one, swiftlang/sourcekit-lsp#257 will also need to be tested with these two.

@benlangmuir benlangmuir mentioned this pull request Mar 23, 2020
Merged
@benlangmuir
Copy link
Contributor

benlangmuir commented Mar 23, 2020

swiftlang/sourcekit-lsp#257
swiftlang/swift#30565
@swift-ci please test

@benlangmuir
Copy link
Contributor

benlangmuir commented Mar 24, 2020

swiftlang/sourcekit-lsp#257
swiftlang/swift#30565
@swift-ci please test

@shahmishal
Copy link
Member

shahmishal commented Apr 20, 2020

@buttaface Can you please resolve the conflict?

<<<<<<< prefix
  env = os.environ
  # Set the toolchain used in tests at runtime
  env['INDEXSTOREDB_TOOLCHAIN_BIN_PATH'] = args.toolchain
=======
  if args.sanitize_all:
    base = args.build_path
>>>>>>> master

@finagolfin
Copy link
Member Author

finagolfin commented Apr 20, 2020

On it.

@shahmishal shahmishal mentioned this pull request Apr 20, 2020
Merged
@finagolfin
Copy link
Member Author

finagolfin commented Apr 20, 2020

Rebased.

@shahmishal shahmishal mentioned this pull request Apr 20, 2020
Merged
@shahmishal
Copy link
Member

shahmishal commented Apr 20, 2020

swiftlang/sourcekit-lsp#257
swiftlang/swift-stress-tester#123
swiftlang/swift-syntax#207
swiftlang/swift#30565
@swift-ci please test

@shahmishal shahmishal merged commit 4c87cec into swiftlang:master Apr 20, 2020
@finagolfin finagolfin deleted the prefix branch April 20, 2020 22:44
@benlangmuir benlangmuir mentioned this pull request Apr 21, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@akyrtzi akyrtzi Awaiting requested review from akyrtzi

1 more reviewer

@benlangmuir benlangmuir benlangmuir approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@finagolfin @benlangmuir @shahmishal