azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Allow setting konan.jvmArgs in gradle plugin tests

Browse Source
This commit is contained in:
Ilya Matveev
2017-12-21 13:40:08 +07:00
committed by ilmat192
parent 68e54c5bb7
commit c26c7f10e3
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/kotlin-native-gradle-plugin/build.gradle
+3
View File
@@ -79,6 +79,9 @@ test {
dependsOn ':dist' dependsOn ':dist'
systemProperty("konan.home", distDir.absolutePath) systemProperty("konan.home", distDir.absolutePath)
} }
if (project.hasProperty("konan.jvmArgs")) {
systemProperty("konan.jvmArgs", project.property("konan.jvmArgs"))
}
// Uncomment for debugging. // Uncomment for debugging.
//testLogging.showStandardStreams = true //testLogging.showStandardStreams = true
if (project.hasProperty("maxParallelForks")) { if (project.hasProperty("maxParallelForks")) {
tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/KonanProject.groovy
+9 -5
View File
@@ -39,8 +39,8 @@ class KonanProject {
Set<File> srcFiles = [] Set<File> srcFiles = []
Set<File> defFiles = [] Set<File> defFiles = []
List<String> interopTasks = [] List<String> interopTasks = []
List<String> compilationTasks = [] List<String> compilationTasks = []
String downloadTask = ":checkKonanCompiler" String downloadTask = ":checkKonanCompiler"
List<String> targets List<String> targets
@@ -193,9 +193,13 @@ class KonanProject {
return generateDefFile(fileName, DEFAULT_DEF_CONTENT) return generateDefFile(fileName, DEFAULT_DEF_CONTENT)
} }
/** Generates gradle.properties file with the konan.home property set. */ /** Generates gradle.properties file with the konan.home and konan.jvmArgs properties set. */
File generatePropertiesFile(String konanHome) { File generatePropertiesFile(String konanHome, String konanJvmArgs = System.getProperty("konan.jvmArgs") ?: "") {
propertiesFile = createFile(projectPath, "gradle.properties", "konan.home=$konanHome\n") propertiesFile = createFile(projectPath, "gradle.properties", """\
konan.home=$konanHome
${!konanJvmArgs.isEmpty() ? "konan.jvmArgs=$konanJvmArgs\n" : ""}
""".stripIndent())
println(propertiesFile.text)
return propertiesFile return propertiesFile
} }