diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
| commit | 4d736a024ca45738412f7cf73994393b7f162811 (patch) | |
| tree | e2b5085817619e9aba3e4f88407f344b36e911af /tools/run_tests/tests.json | |
| parent | 2822e9ad7598a68597e49e8f1875486aa12bf267 (diff) | |
| parent | 8b131922438d96579cb315777ca980e094883496 (diff) | |
Resolved merge conflicts
Diffstat (limited to 'tools/run_tests/tests.json')
| -rw-r--r-- | tools/run_tests/tests.json | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index d2b125fc01..84f830c456 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -191,14 +191,6 @@ }, { "language": "c", - "name": "httpcli_test" - }, - { - "language": "c", - "name": "interop_test" - }, - { - "language": "c", "name": "json_rewrite_test" }, { @@ -291,6 +283,10 @@ }, { "language": "c++", + "name": "interop_test" + }, + { + "language": "c++", "name": "pubsub_publisher_test" }, { |