From af7cf54e512953a9a3e71f6ad4993a7069c093fb Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 22 May 2015 10:07:34 -0700 Subject: [PATCH 1/3] Build shared libraries for wrapped languages too --- tools/run_tests/run_tests.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 3a344693c1f..a1ecb11ef43 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -57,7 +57,7 @@ class SimpleConfig(object): if environ is None: environ = {} self.build_config = config - self.maxjobs = 2 * multiprocessing.cpu_count() + self.maxjobs = 100 * multiprocessing.cpu_count() self.allow_hashing = (config != 'gcov') self.environ = environ self.environ['CONFIG'] = config @@ -151,7 +151,7 @@ class NodeLanguage(object): environ={'GRPC_TRACE': 'surface,batch'})] def make_targets(self): - return ['static_c'] + return ['static_c', 'shared_c'] def build_steps(self): return [['tools/run_tests/build_node.sh']] @@ -170,7 +170,7 @@ class PhpLanguage(object): environ={'GRPC_TRACE': 'surface,batch'})] def make_targets(self): - return ['static_c'] + return ['static_c', 'shared_c'] def build_steps(self): return [['tools/run_tests/build_php.sh']] @@ -204,7 +204,7 @@ class PythonLanguage(object): return files + modules def make_targets(self): - return ['static_c', 'grpc_python_plugin'] + return ['static_c', 'grpc_python_plugin', 'shared_c'] def build_steps(self): return [['tools/run_tests/build_python.sh']] @@ -282,7 +282,7 @@ class Build(object): return [] def make_targets(self): - return ['static'] + return ['static', 'shared'] def build_steps(self): return [] From c82a866c99f165fb46ea2cda60f60e64db44aad0 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 22 May 2015 10:15:55 -0700 Subject: [PATCH 2/3] Fix typo --- tools/run_tests/run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index a1ecb11ef43..ac49885921a 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -57,7 +57,7 @@ class SimpleConfig(object): if environ is None: environ = {} self.build_config = config - self.maxjobs = 100 * multiprocessing.cpu_count() + self.maxjobs = 2 * multiprocessing.cpu_count() self.allow_hashing = (config != 'gcov') self.environ = environ self.environ['CONFIG'] = config From ce192ed4f31bb01964d150c7889c916167ef0755 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 22 May 2015 12:46:14 -0700 Subject: [PATCH 3/3] Fix 4.4 build --- tools/run_tests/run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index ac49885921a..755d460c94c 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -282,7 +282,7 @@ class Build(object): return [] def make_targets(self): - return ['static', 'shared'] + return ['static'] def build_steps(self): return []