Fix paths to stdlib-jre6 test output
This commit is contained in:
committed by
Ilya Chernikov
parent
e3899ff7ee
commit
99f2cc3d00
@@ -65,13 +65,18 @@ test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
task testJre6Tests(type: Test) {
|
task testJre6Tests(type: Test) {
|
||||||
dependsOn project(':kotlin-stdlib').tasks.testClasses
|
dependsOn(':kotlin-stdlib:testClasses')
|
||||||
group = "verification"
|
group = "verification"
|
||||||
|
|
||||||
executable = "$JDK_17/bin/java"
|
executable = "$JDK_17/bin/java"
|
||||||
|
|
||||||
testClassesDir = project.file('../build/classes/test')
|
doFirst {
|
||||||
classpath = project.files('../build/classes/test') + sourceSets.test.compileClasspath
|
testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output
|
||||||
|
classpath = files(
|
||||||
|
testClassesDirs,
|
||||||
|
configurations.testCompile
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
check.dependsOn testJre6Tests
|
check.dependsOn testJre6Tests
|
||||||
@@ -68,13 +68,18 @@ test {
|
|||||||
|
|
||||||
|
|
||||||
task testJre6Tests(type: Test) {
|
task testJre6Tests(type: Test) {
|
||||||
dependsOn project(':kotlin-stdlib').tasks.testClasses
|
dependsOn(':kotlin-stdlib:testClasses')
|
||||||
group = "verification"
|
group = "verification"
|
||||||
|
|
||||||
executable = "$JDK_18/bin/java"
|
executable = "$JDK_18/bin/java"
|
||||||
|
|
||||||
testClassesDir = project.file('../build/classes/test')
|
doFirst {
|
||||||
classpath = project.files('../build/classes/test') + sourceSets.test.compileClasspath
|
testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output
|
||||||
|
classpath = files(
|
||||||
|
testClassesDirs,
|
||||||
|
configurations.testCompile
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
check.dependsOn testJre6Tests
|
check.dependsOn testJre6Tests
|
||||||
Reference in New Issue
Block a user