Skip to content

[build-script] Reject user-supplied '--common-cmake-options' argument #2834

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 1 commit into from
Jun 2, 2016

Conversation

rintaro
Copy link
Member

@rintaro rintaro commented Jun 2, 2016

What's in this pull request?

The build system doesn't support user-supplied --common-cmake-options argument.
This PR catches it in build-script, then exit with error:

$ utils/build-script -Rt --common-cmake-options="-DFOO=BAR"
usage: 
  build-script [-h | --help] [OPTION ...]
  build-script --preset=NAME [SUBSTITUTION ...]
build-script: error: unknown argument: --common-cmake-options

Introduced swift_build_support.arguments.action namespace for custom actions.


Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
All supported platforms @swift-ci Please smoke test and merge
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
All supported platforms @swift-ci Please test and merge
OS X platform @swift-ci Please test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

Note: Only members of the Apple organization can trigger swift-ci.

@rintaro
Copy link
Member Author

rintaro commented Jun 2, 2016

@swift-ci Please test

@gribozavr
Copy link
Contributor

LGTM! Could you disallow --build-jobs as well?

build-script doesn't support manually supplied `--common-cmake-options`.

Introduced argparse action 'arguments.action.unavailable'
@rintaro rintaro force-pushed the build-script-unavailable-args branch from 27927d8 to 5959dd2 Compare June 2, 2016 07:18
@rintaro
Copy link
Member Author

rintaro commented Jun 2, 2016

👍 done.

@gribozavr
Copy link
Contributor

@swift-ci Please smoke test

@gribozavr gribozavr merged commit ec26a59 into swiftlang:master Jun 2, 2016
@rintaro rintaro deleted the build-script-unavailable-args branch June 4, 2016 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants