diff options
author | 2016-07-26 07:44:10 -0400 | |
---|---|---|
committer | 2016-07-26 07:44:10 -0400 | |
commit | 43b633d54f4708750cffe4374c9f56c65bec8fef (patch) | |
tree | 8b1813cd15a7792bfadf1275ab59773d74e71efc /src/objective-c/tests/build_tests.sh | |
parent | 53826511f95cbfa31e3b8316b11cf397830502b0 (diff) | |
parent | 7b104cd1c23a3e6ee3cb0809f39617ceda5e2575 (diff) |
Merge branch 'master' into move_timeout_encoding
Diffstat (limited to 'src/objective-c/tests/build_tests.sh')
-rwxr-xr-x | src/objective-c/tests/build_tests.sh | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/src/objective-c/tests/build_tests.sh b/src/objective-c/tests/build_tests.sh index 8547bfd3a8..bc5bc04494 100755 --- a/src/objective-c/tests/build_tests.sh +++ b/src/objective-c/tests/build_tests.sh @@ -44,26 +44,10 @@ hash xcodebuild 2>/dev/null || { exit 1 } -BINDIR=../../../bins/$CONFIG - -if [ ! -f $BINDIR/protobuf/protoc ]; then - hash protoc 2>/dev/null || { - echo >&2 "Can't find protoc. Make sure run_tests.py is making" \ - "grpc_objective_c_plugin before calling this script." - exit 1 - } - # When protoc is already installed, make doesn't compile one. Put a link - # there so the podspecs can do codegen using that path. - mkdir -p $BINDIR/protobuf - ln -s `which protoc` $BINDIR/protobuf/protoc -fi - -[ -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. It needs to be done" \ - "before because pod install of gRPC renames some C gRPC files" \ - "and not the server's code references to them." - exit 1 -} +# clean the directory +rm -rf Pods +rm -rf Tests.xcworkspace +rm -f Podfile.lock +rm -f RemoteTestClient/*.{h,m} pod install |