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

[tests] use tests for compiler and stdlib from composite build

Browse Source
This commit is contained in:
Vasily Levchenko
2019-06-06 12:35:16 +03:00
parent c5cc5c3d2f
commit 6ed068862a
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/tests/build.gradle
+19 -20
View File
@@ -50,16 +50,26 @@ repositories {
dependencies { dependencies {
cli_bc project(path: ':backend.native', configuration: 'cli_bc') cli_bc project(path: ':backend.native', configuration: 'cli_bc')
update_tests (group: 'org', name: 'Kotlin_dev_Compiler', version: testKotlinCompilerVersion) { if (project.hasProperty("kotlinProjectPath")) {
artifact { /**
name = 'internal/kotlin-test-data' * TODO: It's desired to get archives from composite build automatically, but still user have to execute :kotlin:zipTestData,
type = 'zip' * unfortuantly `buildBy` on ConfigurableFileCollection doesn't work as desired and added dependsOn `:kotlin:zipTestData` in tasks
* using `update_external_tests` fails on evaluation phase.
*/
update_tests files(Paths.get(project.property("kotlinProjectPath").toString(), "dist", "kotlin-test-data.zip").toFile())
update_stdlib_tests files(Paths.get(project.property("kotlinProjectPath").toString(), "dist", "kotlin-stdlib-tests.zip").toFile())
} else {
update_tests(group: 'org', name: 'Kotlin_dev_Compiler', version: testKotlinCompilerVersion) {
artifact {
name = 'internal/kotlin-test-data'
type = 'zip'
}
} }
} update_stdlib_tests (group: 'org', name: 'Kotlin_dev_Compiler', version: kotlinStdlibVersion) {
update_stdlib_tests (group: 'org', name: 'Kotlin_dev_Compiler', version: kotlinStdlibVersion) { artifact {
artifact { name = 'internal/kotlin-stdlib-tests'
name = 'internal/kotlin-stdlib-tests' type = 'zip'
type = 'zip' }
} }
} }
} }
@@ -121,17 +131,6 @@ def update_external_tests() {
externalTestsDir.mkdirs() externalTestsDir.mkdirs()
def compilerTestsFiles = configurations.update_tests.asFileTree def compilerTestsFiles = configurations.update_tests.asFileTree
if (project.hasProperty("kotlinProjectPath")) {
def f = Paths.get(project.property("kotlinProjectPath").toString(), "dist", "kotlin-test-data.zip").toFile()
if (f.exists()) {
println("""
|Using $f as a source of codegen/box* and stdlib tests
|Update test data zip with :kotlin:zipTestData task
""".stripMargin())
compilerTestsFiles = project.files(f)
}
}
copy { copy {
compilerTestsFiles.each { compilerTestsFiles.each {
from(zipTree(it)) from(zipTree(it))