From 37042801c4a69d2f499ed80152fcd88718420f7d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 30 Jul 2019 20:32:49 +0300 Subject: [PATCH] Fix CompilerDaemonTest#testDaemonJvmOptionsParsing Forgot to update test data after 560f1483e8fa71b258e6cc205f200625f92736f5 and 317c39f27d33c2ad05523c2a0a31eb78a07feaa5 #KT-33048 Fixed --- .../tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt | 4 ++-- .../daemon/experimental/integration/CompilerDaemonTest.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index 437c5038517..b96f412b955 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -166,9 +166,9 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() { assertEquals("200m", opts.maxMemory) assertEquals("10k", opts.maxMetaspaceSize) assertEquals("100", opts.reservedCodeCacheSize) - assertEquals(arrayListOf("aaa", "bbb,ccc", "ddd", "xxx,yyy"), opts.jvmParams) + assertEquals(arrayListOf("aaa", "bbb,ccc", "ddd", "xxx,yyy", "ea"), opts.jvmParams) - System.setProperty(COMPILE_DAEMON_JVM_OPTIONS_PROPERTY, "-Xmx300m,-XX:MaxPermSize=10k,-XX:ReservedCodeCacheSize=100") + System.setProperty(COMPILE_DAEMON_JVM_OPTIONS_PROPERTY, "-Xmx300m,-XX:MaxMetaspaceSize=10k,-XX:ReservedCodeCacheSize=100") val opts2 = configureDaemonJVMOptions(inheritMemoryLimits = false, inheritAdditionalProperties = false, inheritOtherJvmOptions = false) assertEquals("300m", opts2.maxMemory) assertEquals( -1, DaemonJVMOptionsMemoryComparator().compare(opts, opts2)) diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt index 9076316cd7e..ce6d0502f25 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt @@ -238,9 +238,9 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() { assertEquals("200m", opts.maxMemory) assertEquals("10k", opts.maxMetaspaceSize) assertEquals("100", opts.reservedCodeCacheSize) - assertEquals(arrayListOf("aaa", "bbb,ccc", "ddd", "xxx,yyy"), opts.jvmParams) + assertEquals(arrayListOf("aaa", "bbb,ccc", "ddd", "xxx,yyy", "ea"), opts.jvmParams) - System.setProperty(COMPILE_DAEMON_JVM_OPTIONS_PROPERTY, "-Xmx300m,-XX:MaxPermSize=10k,-XX:ReservedCodeCacheSize=100") + System.setProperty(COMPILE_DAEMON_JVM_OPTIONS_PROPERTY, "-Xmx300m,-XX:MaxMetaspaceSize=10k,-XX:ReservedCodeCacheSize=100") val opts2 = configureDaemonJVMOptions(inheritMemoryLimits = false, inheritAdditionalProperties = false, inheritOtherJvmOptions = false) assertEquals("300m", opts2.maxMemory)