From 32135429e4a3926d356c2c3179f8d58a1ab7cbaa Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Tue, 7 Aug 2018 14:30:06 +0300 Subject: [PATCH] Use testKotlinVersion as a build version to get tests from --- backend.native/tests/build.gradle | 14 ++++++-------- gradle.properties | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index cd00aae3b1c..f0b37129f1e 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -54,7 +54,7 @@ repositories { dependencies { cli_bc project(path: ':backend.native', configuration: 'cli_bc') - update_tests (group: 'org', name: 'Kotlin_dev_CompilerAllPlugins', version: kotlinVersion) { + update_tests (group: 'org', name: 'Kotlin_dev_CompilerAllPlugins', version: testKotlinVersion) { artifact { name = 'internal/kotlin-test-data' type = 'zip' @@ -119,15 +119,13 @@ task update_external_tests() { // Unzip. delete temporaryDir copy { -// configurations.update_tests.asFileTree.each { -// from(zipTree(it)) { - from(zipTree(file('/Users/ppunegov/ws/kotlin/dist/kotlin-test-data.zip'))) { - - include('compiler/**', 'stdlib/**') + configurations.update_tests.asFileTree.each { + from(zipTree(it)) { + include('compiler/**', 'stdlib/**') } - into(temporaryDir) + into(temporaryDir) + } } - // Copy only used tests into the test directory. externalTestsDir.mkdirs() delete("${externalTestsDir.canonicalPath}/codegen") diff --git a/gradle.properties b/gradle.properties index 050ffa930d1..78a41637fc2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,6 +19,7 @@ buildKotlinVersion=1.2.50 remoteRoot=konan_tests kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.2.70-dev-1218,tag:kotlin-native,pinned:true/artifacts/content/maven kotlinVersion=1.2.70-dev-1218 +testKotlinVersion=1.2.70-dev-979 konanVersion=0.9 org.gradle.jvmargs='-Dfile.encoding=UTF-8'