diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-24 08:52:00 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-24 08:52:00 -0700 |
| commit | c1385d6705bbf2ea57d6d322d2d62bda85685d7f (patch) | |
| tree | 3a74aeb1085186249b4ce8035cd7615ad6859155 | |
| parent | ee56eb60c8aa0e36ac33b00fbd4e70a61412d2e4 (diff) | |
Fix (hackily) fling_stream_test under gyp
| -rw-r--r-- | .gitignore | 4 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 45f8fdaa46..8dc459ea27 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,7 @@ report.xml # port server log portlog.txt + +# gyp generated make files +*-gyp.mk +out
\ No newline at end of file diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index a1d0376a4f..e971aaf9c3 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -199,7 +199,9 @@ class GYPCLanguage(object): return [['gyp', '--depth=.', '--suffix=-gyp', 'grpc.gyp']] def make_targets(self): - return gyp_test_paths(False) + # HACK(ctiller): force fling_client and fling_server to be built, as fling_test + # needs these + return gyp_test_paths(False) + ['fling_client', 'fling_server'] def build_steps(self): return [] |