diff options
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | gradle/android_unit_test.gradle | 7 | ||||
| -rwxr-xr-x | scripts/ci/ci_test.sh | 2 | ||||
| -rwxr-xr-x | scripts/ci/ci_test_heavy.sh | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/gradle.properties b/gradle.properties index 199d5ff50..a49e34dc5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -org.gradle.jvmargs=-Xmx6000M +org.gradle.jvmargs=-Xmx3200M org.gradle.parallel=true org.gradle.configureondemand=false org.gradle.caching=true diff --git a/gradle/android_unit_test.gradle b/gradle/android_unit_test.gradle index dfd66927a..08fc1062c 100644 --- a/gradle/android_unit_test.gradle +++ b/gradle/android_unit_test.gradle @@ -8,7 +8,7 @@ android { all { int maxTestForks = Integer.parseInt(System.getProperty('maxTestForks', project.path == ':app' ? '4' : '1')) - maxParallelForks Math.min(maxTestForks, Runtime.getRuntime().availableProcessors()) + maxParallelForks Math.max(1, (int) Math.min(maxTestForks, (int) (Runtime.getRuntime().availableProcessors() / 2.0))) forkEvery Integer.parseInt(System.getProperty('TEST_FORK_EVERY', '1000')) @@ -41,6 +41,11 @@ android { if (project.hasProperty('excludeTestClasses')) { exclude project.property('excludeTestClasses') } + + // set heap size for the test JVM(s) + // NOTE: This is needed since Gradle does not propagate the heap-size restrictions from gradle.properties file. + minHeapSize = "128m" + maxHeapSize = "1900m" } } } diff --git a/scripts/ci/ci_test.sh b/scripts/ci/ci_test.sh index a06caa4d8..e4b3ecfff 100755 --- a/scripts/ci/ci_test.sh +++ b/scripts/ci/ci_test.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -e -./gradlew --stacktrace testDebugUnitTest testDebugUnitTestCoverage -PexcludeTestClasses="**/*AllSdkTest*" +./gradlew --stacktrace -DmaxTestForks=1 --max-workers=3 testDebugUnitTest testDebugUnitTestCoverage -PexcludeTestClasses="**/*AllSdkTest*" diff --git a/scripts/ci/ci_test_heavy.sh b/scripts/ci/ci_test_heavy.sh index 262e31b41..31d29cadc 100755 --- a/scripts/ci/ci_test_heavy.sh +++ b/scripts/ci/ci_test_heavy.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -e -./gradlew --stacktrace -DmaxTestForks=1 -DTEST_FORK_EVERY=1 -Dorg.gradle.jvmargs=-Xmx7000M :app:testDebugUnitTest --tests="*AllSdkTest*" :app:testDebugUnitTestCoverage +./gradlew --stacktrace -DmaxTestForks=1 -DTEST_FORK_EVERY=1 :app:testDebugUnitTest --tests="*AllSdkTest*" :app:testDebugUnitTestCoverage |