Make plugin & server, and pod install via run_tests.py

pull/2663/head
Jorge Canizales 10 years ago
parent 856aca8d26
commit d0b32e9a55
  1. 5
      src/objective-c/generated_libraries/RemoteTestClient/RemoteTest.podspec
  2. 5
      src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec
  3. 39
      src/objective-c/tests/build_tests.sh
  4. 14
      src/objective-c/tests/run_tests.sh
  5. 4
      tools/run_tests/run_tests.py

@ -8,10 +8,7 @@ Pod::Spec.new do |s|
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.prepare_command = <<-CMD
cd ../../../..
make CONFIG=dbg grpc_objective_c_plugin
cd -
protoc --plugin=protoc-gen-grpc=../../../../bins/dbg/grpc_objective_c_plugin --objc_out=. --grpc_out=. *.proto
protoc --plugin=protoc-gen-grpc=../../../../bins/$CONFIG/grpc_objective_c_plugin --objc_out=. --grpc_out=. *.proto
CMD
s.subspec "Messages" do |ms|

@ -8,10 +8,7 @@ Pod::Spec.new do |s|
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients.
s.prepare_command = <<-CMD
cd ../../../..
make CONFIG=dbg grpc_objective_c_plugin
cd -
protoc --plugin=protoc-gen-grpc=../../../../bins/dbg/grpc_objective_c_plugin --objc_out=. --grpc_out=. *.proto
protoc --plugin=protoc-gen-grpc=../../../../bins/$CONFIG/grpc_objective_c_plugin --objc_out=. --grpc_out=. *.proto
CMD
s.subspec "Messages" do |ms|

@ -0,0 +1,39 @@
#!/bin/bash
# Copyright 2015, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -e
cd $(dirname $0)
# The local test server needs to be compiled before this because pod install of
# gRPC renames some C gRPC files and not the server's code references to them.
#
# Suppress error output because Cocoapods issue #3823 causes a flooding warning.
pod install 2>/dev/null

@ -32,18 +32,8 @@ set -e
cd $(dirname $0)
# Compile the C++ interop server if it doesn't exist yet. This has to be done
# before pod install because the latter renames some C gRPC files and not the
# interop server references to them.
cd ../../..
[ -f bins/dbg/interop_server ] || make CONFIG=dbg interop_server
cd -
# Suppress error output because Cocoapods issue #3823 causes a flooding warning.
pod install 2>/dev/null
# Run the server.
../../../bins/dbg/interop_server --port=5050 &
# Run the tests server.
../../../bins/$CONFIG/interop_server --port=5050 &
# Kill it when this script exits.
trap 'kill -9 `jobs -p`' EXIT

@ -311,10 +311,10 @@ class ObjCLanguage(object):
environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
def make_targets(self):
return []
return ['grpc_objective_c_plugin', 'interop_server']
def build_steps(self):
return []
return [['src/objective-c/tests/build_tests.sh']]
def supports_multi_config(self):
return False

Loading…
Cancel
Save