From ddc3b5e85538b3d073e334998a524ad8389c444f Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Sun, 12 Jul 2020 13:25:35 +0700 Subject: [PATCH] Build infrastructure: fix external tests after Gradle update (cherry picked from commit df96df5099b6b49a623f227313aeaccf67289fb6) --- .../src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy b/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy index 744368766e7..2e17f10bf70 100644 --- a/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy +++ b/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy @@ -63,6 +63,7 @@ class RunExternalTestGroup extends JavaExec { RunExternalTestGroup() { // We don't build the compiler if a custom dist path is specified. UtilsKt.dependsOnDist(this) + main = 'org.jetbrains.kotlin.cli.bc.K2NativeKt' } @Override @@ -75,7 +76,6 @@ class RunExternalTestGroup extends JavaExec { protected void runCompiler(List filesToCompile, String output, List moreArgs) { def log = new ByteArrayOutputStream() try { - main = 'org.jetbrains.kotlin.cli.bc.K2NativeKt' classpath = project.fileTree("$dist.canonicalPath/konan/lib/") { include '*.jar' }