diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-07 14:26:37 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-07 14:26:37 -0700 |
| commit | 90576b1b67f48a1581f6cf36626118e5035d16d1 (patch) | |
| tree | edbb2878a1baee506a1ce0d21dd57bd17fb06a6a /tools/run_tests/run_tests.py | |
| parent | 43b817ced14083de585111c2657bbe34040bdcc7 (diff) | |
| parent | 70c0b32c0fc5db15c764a2e22c2491d19d7cff7b (diff) | |
Merge remote-tracking branch 'upstream/master' into run_interop_tests_go
Diffstat (limited to 'tools/run_tests/run_tests.py')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 168331602c..a6f3d405dc 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1423,7 +1423,7 @@ else: exit_code = 0 if BuildAndRunError.BUILD in errors: exit_code |= 1 - if BuildAndRunError.TEST in errors and not args.travis: + if BuildAndRunError.TEST in errors: exit_code |= 2 if BuildAndRunError.POST_TEST in errors: exit_code |= 4 |