Skip to content

[gyb] Add gyb doctest to validation-test #2980

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 10, 2016

Conversation

rintaro
Copy link
Member

@rintaro rintaro commented Jun 10, 2016

WARNING: DO NOT MERGE BEFORE #2978

What's in this pull request?

  • Added gyb doctest to validation test as validation-test/Python/gyb.swift

  • Removed --test option from normal gyb invocation in CMakeLists.txt.
    While I agree with the comment:

    Run gyb's self-tests whenever we use it. They're cheap enough and it keeps us honest.

    Do we really need it?

Resolved bug number: (SR-)


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 10, 2016

Confirming failure before #2978 merged.
@swift-ci Please test

@rintaro rintaro force-pushed the gyb-validation-test branch from c7ef749 to 46a6df2 Compare June 10, 2016 09:58
@rintaro
Copy link
Member Author

rintaro commented Jun 10, 2016

@swift-ci Please smoke test

@@ -0,0 +1,4 @@
// RUN: %{python} -m doctest %S/../../utils/gyb.py
// RUN: echo 'Hello ${ME}' | %S/../../utils/gyb --test -DME=Swift | FileCheck %s
// RUN: echo 'Hello ${ME}' | %S/../../utils/gyb --verbose-test -DME=Swift | FileCheck %s
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use the %gyb substitution? You can also add a %gyb-py one to test/lit.cfg.

Copy link
Member Author

@rintaro rintaro Jun 10, 2016

Choose a reason for hiding this comment

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

@gribozavr I'm actually preparing lit substitutions patch
master...rintaro:tests-substitution-utils

Copy link
Contributor

Choose a reason for hiding this comment

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

Great! Sorry, I didn't realize that we were using %S/../../../utils/gyb in other tests.

@gribozavr
Copy link
Contributor

@swift-ci Please smoke test and merge

@swift-ci swift-ci merged commit c8bbd63 into swiftlang:master Jun 10, 2016
@rintaro rintaro deleted the gyb-validation-test branch June 12, 2016 15:51
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