diff options
| author |  Robbie Shade <rjshade@google.com> | 2016-07-26 07:44:10 -0400 |
|---|---|---|
| committer | Robbie Shade <rjshade@google.com> | 2016-07-26 07:44:10 -0400 |
| commit | 43b633d54f4708750cffe4374c9f56c65bec8fef (patch) | |
| tree | 8b1813cd15a7792bfadf1275ab59773d74e71efc /src/objective-c/tests/run_tests.sh | |
| parent | 53826511f95cbfa31e3b8316b11cf397830502b0 (diff) | |
| parent | 7b104cd1c23a3e6ee3cb0809f39617ceda5e2575 (diff) | |
Merge branch 'master' into move_timeout_encoding
Diffstat (limited to 'src/objective-c/tests/run_tests.sh')
| -rwxr-xr-x | src/objective-c/tests/run_tests.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/objective-c/tests/run_tests.sh b/src/objective-c/tests/run_tests.sh index c4fc5644f2..a265149f48 100755 --- a/src/objective-c/tests/run_tests.sh +++ b/src/objective-c/tests/run_tests.sh @@ -31,13 +31,21 @@ # Don't run this script standalone. Instead, run from the repository root: # ./tools/run_tests/run_tests.py -l objc -set -e +set -ev cd $(dirname $0) # Run the tests server. -../../../bins/$CONFIG/interop_server --port=5050 & -../../../bins/$CONFIG/interop_server --port=5051 --use_tls & + +BINDIR=../../../bins/$CONFIG + +[ -f $BINDIR/interop_server ] || { + echo >&2 "Can't find the test server. Make sure run_tests.py is making" \ + "interop_server before calling this script." + exit 1 +} +$BINDIR/interop_server --port=5050 & +$BINDIR/interop_server --port=5051 --use_tls & # Kill them when this script exits. trap 'kill -9 `jobs -p`' EXIT |