From c26c7f10e3915b737a0e60befa7fdcc327e82b56 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Thu, 21 Dec 2017 13:40:08 +0700
Subject: [PATCH] tests: Allow setting konan.jvmArgs in gradle plugin tests

---
 tools/kotlin-native-gradle-plugin/build.gradle     |  3 +++
 .../kotlin/gradle/plugin/test/KonanProject.groovy  | 14 +++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/kotlin-native-gradle-plugin/build.gradle
index 72ef09fe9b7..b7a734a66af 100644
--- a/tools/kotlin-native-gradle-plugin/build.gradle
+++ b/tools/kotlin-native-gradle-plugin/build.gradle
@@ -79,6 +79,9 @@ test {
         dependsOn ':dist'
         systemProperty("konan.home", distDir.absolutePath)
     }
+    if (project.hasProperty("konan.jvmArgs")) {
+        systemProperty("konan.jvmArgs", project.property("konan.jvmArgs"))
+    }
     // Uncomment for debugging.
     //testLogging.showStandardStreams = true
     if (project.hasProperty("maxParallelForks")) {
diff --git a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy
index f24df737fda..80d9f6add7e 100644
--- a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy
+++ b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy
@@ -39,8 +39,8 @@ class KonanProject {
     Set<File>    srcFiles = []
     Set<File>    defFiles = []
 
-    List<String>  interopTasks = []
-    List<String>  compilationTasks = []
+    List<String> interopTasks = []
+    List<String> compilationTasks = []
     String       downloadTask = ":checkKonanCompiler"
 
     List<String> targets
@@ -193,9 +193,13 @@ class KonanProject {
         return generateDefFile(fileName, DEFAULT_DEF_CONTENT)
     }
 
-    /** Generates gradle.properties file with the konan.home property set. */
-    File generatePropertiesFile(String konanHome) {
-        propertiesFile = createFile(projectPath, "gradle.properties", "konan.home=$konanHome\n")
+    /** Generates gradle.properties file with the konan.home and konan.jvmArgs properties set. */
+    File generatePropertiesFile(String konanHome, String konanJvmArgs = System.getProperty("konan.jvmArgs") ?: "") {
+        propertiesFile = createFile(projectPath, "gradle.properties", """\
+            konan.home=$konanHome
+            ${!konanJvmArgs.isEmpty() ? "konan.jvmArgs=$konanJvmArgs\n" : ""}
+        """.stripIndent())
+        println(propertiesFile.text)
         return propertiesFile
     }