aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/run_tests.py
diff options
context:
space:
mode:
authorGravatar Michael Lumish <mlumish@google.com>2015-09-24 10:42:54 -0700
committerGravatar Michael Lumish <mlumish@google.com>2015-09-24 10:42:54 -0700
commit9e71674ab942c748f24e945327424163c15b5e66 (patch)
tree75ff3a8a21f7914223351fd37e6dfa6d81bf7338 /tools/run_tests/run_tests.py
parent40a595135dc962f7f9c32d841b5829f9152f6b16 (diff)
parentc1385d6705bbf2ea57d6d322d2d62bda85685d7f (diff)
Merge pull request #3459 from ctiller/its-a-gyp
Fix (hackily) fling_stream_test under gyp
Diffstat (limited to 'tools/run_tests/run_tests.py')
-rwxr-xr-xtools/run_tests/run_tests.py4
1 files changed, 3 insertions, 1 deletions
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 []