Adjust tests to Java 8 default daemon args changes (gradle#2310)

pkubowicz · Jul 10, 2017 · bc370f3 · bc370f3
1 parent 7c034a0
commit bc370f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...cher/src/test/groovy/org/gradle/launcher/daemon/configuration/DaemonParametersTest.groovy b/...cher/src/test/groovy/org/gradle/launcher/daemon/configuration/DaemonParametersTest.groovy
@@ -76,20 +76,20 @@ class DaemonParametersTest extends Specification {
         parameters.effectiveJvmArgs.intersect(parameters.DEFAULT_JVM_ARGS).empty
     }
 
-    def "can apply defaults for Java 8 and earlier"() {
+    def "can apply defaults for Java 7 and earlier"() {
         when:
-        parameters.applyDefaultsFor(JavaVersion.VERSION_1_8)
+        parameters.applyDefaultsFor(JavaVersion.VERSION_1_7)
 
         then:
         parameters.effectiveJvmArgs.containsAll(DaemonParameters.DEFAULT_JVM_ARGS)
     }
 
-    def "can apply defaults for Java 9"() {
+    def "can apply defaults for Java 8 and later"() {
         when:
         parameters.applyDefaultsFor(JavaVersion.VERSION_1_9)
 
         then:
-        parameters.effectiveJvmArgs.containsAll(DaemonParameters.DEFAULT_JVM_9_ARGS)
+        parameters.effectiveJvmArgs.containsAll(DaemonParameters.DEFAULT_JVM_8_ARGS)
         !parameters.effectiveJvmArgs.containsAll(DaemonParameters.DEFAULT_JVM_ARGS)
     }
 

diff --git a/.../integTest/groovy/org/gradle/integtests/tooling/r22/ClientShutdownCrossVersionSpec.groovy b/.../integTest/groovy/org/gradle/integtests/tooling/r22/ClientShutdownCrossVersionSpec.groovy
@@ -16,12 +16,14 @@
 
 package org.gradle.integtests.tooling.r22
 
+import org.gradle.api.JavaVersion
 import org.gradle.integtests.fixtures.executer.GradleExecuter
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.test.fixtures.server.http.CyclicBarrierHttpServer
 import org.gradle.tooling.model.gradle.GradleBuild
+import org.gradle.util.GradleVersion
 import org.junit.Rule
 
 @ToolingApiVersion(">=2.2")
@@ -128,6 +130,7 @@ task slow { doLast { new URL("${server.uri}").text } }
     private GradleExecuter daemonExecutor() {
         // Need to use the same JVM args to start daemon as those used by tooling api fixture
         // TODO - use more sane JVM args here and for the daemons started using tooling api fixture
-        targetDist.executer(temporaryFolder, getBuildContext()).withNoExplicitTmpDir().withDaemonBaseDir(toolingApi.daemonBaseDir).withBuildJvmOpts("-Xmx1024m", "-XX:MaxPermSize=256m", "-XX:+HeapDumpOnOutOfMemoryError").useOnlyRequestedJvmOpts().requireDaemon()
+        def jvmOpts = JavaVersion.current() >= JavaVersion.VERSION_1_8 && GradleVersion.version(targetDist.version.version) > GradleVersion.version('4.0.2') ? ["-Xmx1024m", "-XX:+HeapDumpOnOutOfMemoryError"] : ["-Xmx1024m", "-XX:MaxPermSize=256m", "-XX:+HeapDumpOnOutOfMemoryError"]
+        targetDist.executer(temporaryFolder, getBuildContext()).withNoExplicitTmpDir().withDaemonBaseDir(toolingApi.daemonBaseDir).withBuildJvmOpts(jvmOpts).useOnlyRequestedJvmOpts().requireDaemon()
     }
 }