diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-01-27 16:04:46 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-01-27 16:04:46 -0800 |
| commit | 4130e152f7ed61c987fc8f42e453d081c82fe908 (patch) | |
| tree | ec3ee05a892d001d7d7b29fb206a34313b9be86a | |
| parent | 86363e540ebc885cf004a35a2eb5193b1e02f4d2 (diff) | |
| parent | efce38195d612e73e83aff002a74da6a8410cf6a (diff) | |
Merge pull request #4930 from ctiller/things_be_slow
Tweaks to improve Jenkins CPU utilization
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | build.yaml | 2 | ||||
| -rwxr-xr-x | tools/jenkins/run_jenkins.sh | 2 | ||||
| -rw-r--r-- | tools/run_tests/configs.json | 2 | ||||
| -rwxr-xr-x | tools/run_tests/jobset.py | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -208,7 +208,7 @@ CFLAGS_msan = -O0 -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-fr CXXFLAGS_msan = -O0 -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-command-line-argument -fPIE -pie LDFLAGS_msan = -fsanitize=memory -DGTEST_HAS_TR1_TUPLE=0 -DGTEST_USE_OWN_TR1_TUPLE=1 -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,) DEFINES_msan = NDEBUG -DEFINES_msan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=1.5 +DEFINES_msan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=2 VALID_CONFIG_mutrace = 1 CC_mutrace = $(DEFAULT_CC) diff --git a/build.yaml b/build.yaml index 6cb861d52e..3b02c38fce 100644 --- a/build.yaml +++ b/build.yaml @@ -2561,7 +2561,7 @@ configs: -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,) LDXX: clang++ compile_the_world: true - timeout_multiplier: 1.5 + timeout_multiplier: 2 mutrace: CPPFLAGS: -O0 DEFINES: _DEBUG DEBUG diff --git a/tools/jenkins/run_jenkins.sh b/tools/jenkins/run_jenkins.sh index 123b252719..4cb31e601a 100755 --- a/tools/jenkins/run_jenkins.sh +++ b/tools/jenkins/run_jenkins.sh @@ -49,7 +49,7 @@ fi unset platform # variable named 'platform' breaks the windows build -python tools/run_tests/run_tests.py $USE_DOCKER_MAYBE -t -l $language -c $config -x report.xml -j 3 $@ || TESTS_FAILED="true" +python tools/run_tests/run_tests.py $USE_DOCKER_MAYBE -t -l $language -c $config -x report.xml -j 2 $@ || TESTS_FAILED="true" if [ ! -e reports/index.html ] then diff --git a/tools/run_tests/configs.json b/tools/run_tests/configs.json index 769942df99..d508c6394c 100644 --- a/tools/run_tests/configs.json +++ b/tools/run_tests/configs.json @@ -59,7 +59,7 @@ }, { "config": "msan", - "timeout_multiplier": 1.5 + "timeout_multiplier": 2 }, { "config": "mutrace" diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index beeb99c0ae..adf178bb3c 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -360,7 +360,7 @@ class Jobset(object): if self.cancelled(): return False current_cpu_cost = self.cpu_cost() if current_cpu_cost == 0: break - if current_cpu_cost + spec.cpu_cost < self._maxjobs: break + if current_cpu_cost + spec.cpu_cost <= self._maxjobs: break self.reap() if self.cancelled(): return False if spec.hash_targets: |