Skip to content

[Shepherd] Do stricter checking of -D command line arguments #10248

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
Jun 14, 2017

Conversation

CodaFi
Copy link
Contributor

@CodaFi CodaFi commented Jun 14, 2017

This rebases #6813 and updates a failing test.

Fixes SR-2404.

Check if the condition "name" is a proper identifier, and generate an
error when assigning specific values in -D conditions.

Fixes SR-2404.
@CodaFi CodaFi requested a review from jrose-apple June 14, 2017 17:17
@CodaFi
Copy link
Contributor Author

CodaFi commented Jun 14, 2017

@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.

Looks good with just one testing comment.

@@ -16,15 +16,15 @@


// RUN: %swift_driver -lldb-repl -### | %FileCheck -check-prefix=LLDB %s
// RUN: %swift_driver -lldb-repl -DA,B,C -DD -L /path/to/libraries -L /path/to/more/libraries -F /path/to/frameworks -lsomelib -framework SomeFramework -sdk / -I "this folder" -module-name Test -target %target-triple -### | %FileCheck -check-prefix=LLDB-OPTS %s
// RUN: %swift_driver -lldb-repl -DD -L /path/to/libraries -L /path/to/more/libraries -F /path/to/frameworks -lsomelib -framework SomeFramework -sdk / -I "this folder" -module-name Test -target %target-triple -### | %FileCheck -check-prefix=LLDB-OPTS %s
Copy link
Contributor

Choose a reason for hiding this comment

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

Please do still include multiple -D flags. It's not critical but the test was confirming that they get passed in the same order.

@CodaFi CodaFi force-pushed the conditional-surrender branch from b9dcb29 to e778c8c Compare June 14, 2017 18:22
@CodaFi
Copy link
Contributor Author

CodaFi commented Jun 14, 2017

@swift-ci please smoke test

@CodaFi
Copy link
Contributor Author

CodaFi commented Jun 14, 2017

⛵️

@CodaFi CodaFi merged commit db3796d into swiftlang:master Jun 14, 2017
@CodaFi CodaFi deleted the conditional-surrender branch June 14, 2017 20:33
jrose-apple pushed a commit to jrose-apple/swift that referenced this pull request Jul 1, 2017
[Shepherd] Do stricter checking of -D command line arguments
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