diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-03 21:21:23 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-03 21:21:23 -0800 |
| commit | 30fd935a4f3a55da6032a5a2278b9fb4b1ab37e9 (patch) | |
| tree | 23dfbbe4ede858c9a329cbf4d2be84d4d1de1272 /test/core | |
| parent | d642dcf9201ccc499690b7da4afa85cb249c32d3 (diff) | |
| parent | 78d1fd07d27a2ac28eca792933e052cb1fe1fa17 (diff) | |
Merge github.com:google/grpc into async-api
Diffstat (limited to 'test/core')
| -rw-r--r-- | test/core/end2end/README | 3 | ||||
| -rwxr-xr-x | test/core/end2end/gen_build_json.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/test/core/end2end/README b/test/core/end2end/README index 31598b61b8..59daec45d0 100644 --- a/test/core/end2end/README +++ b/test/core/end2end/README @@ -5,6 +5,3 @@ To add a new test or fixture: - add the code to the relevant directory - update gen_build_json.py to reflect the change - regenerate projects -// MOE:begin_strip -- update net/grpc/c/BUILD to reflect the change -// MOE:end_strip
\ No newline at end of file diff --git a/test/core/end2end/gen_build_json.py b/test/core/end2end/gen_build_json.py index 2c4368fe76..e28dbdb85d 100755 --- a/test/core/end2end/gen_build_json.py +++ b/test/core/end2end/gen_build_json.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2.7 """Generates the appropriate build.json data for all the end2end tests.""" |