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.

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

Merged
merged 2 commits into from
Jun 10, 2016
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8724662
[gyb] Add gyb doctest to validation-test
rintaro Jun 10, 2016
46a6df2
[CMake] Remove `--test` option from normal gyb invocation in CMake
rintaro Jun 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmake/modules/SwiftHandleGybSources.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ function(handle_gyb_source_single dependency_out_var_name)
"${options}" "${single_value_args}" "${multi_value_args}" ${ARGN})

set(gyb_flags
"--test" # Run gyb's self-tests whenever we use it. They're cheap
# enough and it keeps us honest.
${SWIFT_GYB_FLAGS}
${GYB_SINGLE_FLAGS})

Expand Down
4 changes: 4 additions & 0 deletions validation-test/Python/gyb.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 •
edited
Loading

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.

// CHECK: Hello Swift