From a63d1a53c3260837bfccbf1a4640161fa0e4842b Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 6 Sep 2017 16:00:34 +0300 Subject: [PATCH] Reduce memory requirements for gradle and js backend tests --- buildSrc/src/main/kotlin/tasks.kt | 4 ++-- gradle.properties | 2 +- js/js.tests/build.gradle.kts | 10 +++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 7495e190ecc..fa2983fe37e 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -29,8 +29,8 @@ fun Project.projectTest(body: Test.() -> Unit = {}): Test = (tasks.findByName("t } } } - jvmArgs("-ea", "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1200m", "-XX:+UseCodeCacheFlushing", "-XX:ReservedCodeCacheSize=128m", "-Djna.nosys=true") - maxHeapSize = "1200m" + jvmArgs("-ea", "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1100m", "-XX:+UseCodeCacheFlushing", "-XX:ReservedCodeCacheSize=128m", "-Djna.nosys=true") + maxHeapSize = "1100m" systemProperty("idea.is.unit.test", "true") environment("NO_FS_ROOTS_ACCESS_CHECK", "true") environment("KOTLIN_HOME", rootProject.extra["distKotlinHomeDir"]) diff --git a/gradle.properties b/gradle.properties index 13e1ca1a4bf..5967c4a17f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.daemon=true org.gradle.parallel=false org.gradle.configureondemand=false -org.gradle.jvmargs=-Xmx1200m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled +org.gradle.jvmargs=-Xmx1000m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled systemProp.bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev systemProp.bootstrap.kotlin.version=1.1.5-dev-970 diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index b2e84f15b56..161b003359b 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -3,16 +3,20 @@ apply { plugin("kotlin") } dependencies { testCompile(project(":compiler.tests-common")) - testCompile(project(":compiler:frontend")) - testCompile(project(":compiler:cli")) + testCompileOnly(project(":compiler:frontend")) + testCompileOnly(project(":compiler:cli")) testCompileOnly(project(":compiler:util")) testCompile(project(":js:js.translator")) testCompile(project(":js:js.serializer")) testCompile(project(":js:js.dce")) testCompile(ideaSdkDeps("openapi", "idea")) + testRuntime(commonDep("junit:junit")) + testRuntime(projectDist(":kotlin-test:kotlin-test-jvm")) + testRuntime(projectDist(":kotlin-test:kotlin-test-junit")) testRuntime(projectDist(":kotlin-stdlib")) + testRuntime(projectDist(":kotlin-reflect")) testRuntime(project(":compiler:backend-common")) - testRuntime(ideaSdkDeps("*.jar")) +// testRuntime(ideaSdkDeps("*.jar")) testRuntime(commonDep("org.fusesource.jansi", "jansi")) }