aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-05-14 06:22:26 +0200
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-05-14 07:15:44 +0200
commitcbd9c8bf9bb8f17bd1b107b4ac95dc1ae5a6a959 (patch)
tree4f1d0556938096fb3001a9b44aa30a04684d58d1 /tools
parent2e4b735f613e6259161c20e0c6d292b40c868bfb (diff)
Changing run_tests to simplify the ruby build.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run_tests/build_ruby.sh13
-rwxr-xr-xtools/run_tests/run_tests.py2
2 files changed, 4 insertions, 11 deletions
diff --git a/tools/run_tests/build_ruby.sh b/tools/run_tests/build_ruby.sh
index 53a69cf079..de96413bc1 100755
--- a/tools/run_tests/build_ruby.sh
+++ b/tools/run_tests/build_ruby.sh
@@ -31,17 +31,10 @@
set -ex
-CONFIG=${CONFIG:-opt}
+export CONFIG=${CONFIG:-opt}
-# change to grpc repo root
-cd $(dirname $0)/../..
-
-# tells npm install to look for files in that directory
-export GRPC_ROOT=`pwd`
-# tells npm install the subdirectory with library files
-export GRPC_LIB_SUBDIR=libs/$CONFIG
-
-cd src/ruby
+# change to grpc's ruby directory
+cd $(dirname $0)/../../src/ruby
bundle install
rake compile:grpc
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 7150ebb553..41f53a434a 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -214,7 +214,7 @@ class RubyLanguage(object):
return [config.job_spec(['tools/run_tests/run_ruby.sh'], None)]
def make_targets(self):
- return ['static_c']
+ return ['run_dep_checks']
def build_steps(self):
return [['tools/run_tests/build_ruby.sh']]