Skip to content

Commit

Permalink
Make ruby tests see changes to C core
Browse files Browse the repository at this point in the history
  • Loading branch information
murgatroid99 committed Jul 30, 2015
1 parent 0814371 commit a43c14f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 2 additions & 4 deletions src/ruby/ext/grpc/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,8 @@ def check_grpc_root
else
grpc_lib_dir = File.join(File.join(grpc_root, 'libs'), grpc_config)
end
unless File.exist?(File.join(grpc_lib_dir, 'libgrpc.a'))
print "Building internal gRPC\n"
system("make -C #{grpc_root} static_c CONFIG=#{grpc_config}")
end
print "Building internal gRPC\n"
system("make -C #{grpc_root} static_c CONFIG=#{grpc_config}")
$CFLAGS << ' -I' + File.join(grpc_root, 'include')
$LDFLAGS << ' -L' + grpc_lib_dir
raise 'gpr not found' unless have_library('gpr', 'gpr_now')
Expand Down
2 changes: 2 additions & 0 deletions tools/run_tests/build_ruby.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,7 @@ export GRPC_CONFIG=${CONFIG:-opt}
# change to grpc's ruby directory
cd $(dirname $0)/../../src/ruby

rm -rf ./tmp

bundle install
rake compile:grpc
2 changes: 1 addition & 1 deletion tools/run_tests/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def test_specs(self, config, travis):
environ=_FORCE_ENVIRON_FOR_WRAPPERS)]

def make_targets(self):
return ['run_dep_checks']
return ['static_c']

def build_steps(self):
return [['tools/run_tests/build_ruby.sh']]
Expand Down

0 comments on commit a43c14f

Please sign in to comment.