From c1385d6705bbf2ea57d6d322d2d62bda85685d7f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 24 Sep 2015 08:52:00 -0700 Subject: Fix (hackily) fling_stream_test under gyp --- .gitignore | 4 ++++ tools/run_tests/run_tests.py | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 [] -- cgit v1.2.3