From 7fe07887cc7f223ac739be4701fabe1bc22fdf61 Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Thu, 7 Mar 2019 15:01:16 +0200 Subject: [PATCH 1/2] Run the build integ test in parallel Because the randomized runner lives in buildSrc, we run these tests with the Gradle runner, and had no parallelism configured so far. --- buildSrc/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 2b5e4f2d24d1f..c303858b48996 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -227,6 +227,7 @@ if (project != rootProject) { systemProperty 'test.local-test-downloads-path', localDownloads systemProperty 'test.version_under_test', version systemProperty 'test.lucene-snapshot-revision', (versions.lucene =~ /\w+-snapshot-([a-z0-9]+)/)[0][1] + maxParallelForks System.getProperty('tests.jvms', project.rootProject.ext.defaultParallel) as Integer } check.dependsOn(integTest) From 842cf957542702eba0cc8b83f820df58da60860a Mon Sep 17 00:00:00 2001 From: Alpar Torok Date: Tue, 26 Mar 2019 12:42:03 +0200 Subject: [PATCH 2/2] Handle Windows and "auto" better --- buildSrc/build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 5cf84d02b498f..be54b2c68f639 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -232,7 +232,11 @@ if (project != rootProject) { if (isLuceneSnapshot) { systemProperty 'test.lucene-snapshot-revision', isLuceneSnapshot[0][1] } - maxParallelForks System.getProperty('tests.jvms', project.rootProject.ext.defaultParallel) as Integer + String defaultParallel = System.getProperty('tests.jvms', project.rootProject.ext.defaultParallel) + if (defaultParallel == "auto") { + defaultParallel = Math.max(Runtime.getRuntime().availableProcessors(), 4) + } + maxParallelForks defaultParallel as Integer } check.dependsOn(integTest)