From 9260a95062ceb278f2e644a537705cbb4aeca56c Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Sat, 3 Oct 2015 15:53:27 -0700 Subject: [PATCH 1/3] Explicit Python version for port_server --- 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 38c06764b9b..51008538f27 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -728,7 +728,7 @@ def _start_port_server(port_server_port): if not running: port_log = open('portlog.txt', 'w') port_server = subprocess.Popen( - ['python', 'tools/run_tests/port_server.py', '-p', '%d' % port_server_port], + ['python2.7', 'tools/run_tests/port_server.py', '-p', '%d' % port_server_port], stderr=subprocess.STDOUT, stdout=port_log) # ensure port server is up From 9a170333d5b6aaa5eba7663cc583ca34a97ba89b Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Sun, 4 Oct 2015 15:40:54 -0700 Subject: [PATCH 2/3] Idem for generate_projects.py --- gRPC.podspec | 1 + tools/buildgen/generate_projects.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gRPC.podspec b/gRPC.podspec index 46823453bab..122c16eff85 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -46,6 +46,7 @@ Pod::Spec.new do |s| s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "release-#{version.gsub(/\./, '_')}-objectivec-#{version}" } + s.ios.deployment_target = '7.1' s.osx.deployment_target = '10.9' s.requires_arc = true diff --git a/tools/buildgen/generate_projects.py b/tools/buildgen/generate_projects.py index c3e2b120516..b2c3c26aa62 100755 --- a/tools/buildgen/generate_projects.py +++ b/tools/buildgen/generate_projects.py @@ -55,7 +55,7 @@ for root, dirs, files in os.walk('templates'): out = out_dir + '/' + os.path.splitext(f)[0] if not os.path.exists(out_dir): os.makedirs(out_dir) - cmd = ['python', 'tools/buildgen/mako_renderer.py'] + cmd = ['python2.7', 'tools/buildgen/mako_renderer.py'] for plugin in plugins: cmd.append('-p') cmd.append(plugin) From 985f22e42b2404420264be0b2e21f81d1efd6b52 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Sun, 4 Oct 2015 23:14:37 -0700 Subject: [PATCH 3/3] Limited number of parallel jobs for generate_projects --- tools/buildgen/generate_projects.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/buildgen/generate_projects.py b/tools/buildgen/generate_projects.py index b2c3c26aa62..5feebf0cac5 100755 --- a/tools/buildgen/generate_projects.py +++ b/tools/buildgen/generate_projects.py @@ -34,6 +34,7 @@ import os import shutil import sys import tempfile +import multiprocessing sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..', 'run_tests')) assert sys.argv[1:], 'run generate_projects.sh instead of this directly' @@ -73,7 +74,7 @@ for root, dirs, files in os.walk('templates'): cmd.append(root + '/' + f) jobs.append(jobset.JobSpec(cmd, shortname=out)) -jobset.run(jobs) +jobset.run(jobs, maxjobs=multiprocessing.cpu_count()) if test is not None: for s, g in test.iteritems():