diff options
author | David Garcia Quintas <dgq@google.com> | 2015-06-15 23:53:27 -0700 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2015-06-15 23:53:27 -0700 |
commit | 4d9414064e7dd391ad1de6aa09b54c795e78180c (patch) | |
tree | e2af55ea00dbd8f5c6989c11c815f9e1b682e7fd /tools/run_tests | |
parent | b8f54505141724ad15dfe9c9c4edd8f1faf08fdf (diff) | |
parent | ac366f9c2e3736815c4445baa4ad4745d2b0b511 (diff) |
Merge branch 'master' of github.com:grpc/grpc into flags-abi
Diffstat (limited to 'tools/run_tests')
-rwxr-xr-x | tools/run_tests/run_tests.py | 2 | ||||
-rw-r--r-- | tools/run_tests/tests.json | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index ea40d7e990..2c9ffe72ec 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -123,7 +123,7 @@ class CLanguage(object): if travis and target['flaky']: continue if self.platform == 'windows': - binary = 'vsprojects\\test_bin\\%s.exe' % (target['name']) + binary = 'vsprojects/test_bin/%s.exe' % (target['name']) else: binary = 'bins/%s/%s' % (config.build_config, target['name']) out.append(config.job_spec([binary], [binary])) diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index d0d56ddb01..77b334577f 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -353,7 +353,6 @@ "language": "c", "name": "httpcli_test", "platforms": [ - "windows", "posix" ] }, |