Include all jvm stdlib tests into kotlin-stdlib project test

JVM stdlib tests are compiled against JDK 8 so there's no need to divide them by modules anymore

#KT-51907
This commit is contained in:
Ilya Gorbunov
2023-01-20 05:07:44 +01:00
committed by Space Team
parent 72ced53833
commit 8b68234528
3 changed files with 14 additions and 52 deletions
+1 -21
View File
@@ -15,12 +15,6 @@ sourceSets {
}
test {
kotlin {
srcDir 'test'
if(!BuildPropertiesKt.getKotlinBuildProperties(project).inIdeaSync) {
srcDir '../jvm/test'
srcDir '../common/test'
srcDir '../test'
}
}
}
noJdk7Test {
@@ -94,20 +88,6 @@ configureFrontendIr(project)
LibrariesCommon.configureJava9Compilation(project, 'kotlin.stdlib.jdk7')
task testJdk6Tests(type: Test) {
dependsOn(':kotlin-stdlib:testClasses')
group = "verification"
def kotlinStdLibTestOutput = project(':kotlin-stdlib').sourceSets.test.output
def objectFactory = project.objects
doFirst {
testClassesDirs = kotlinStdLibTestOutput
classpath = objectFactory.fileCollection().from(
testClassesDirs,
sourceSets.test.compileClasspath
)
}
}
task testNoJdk7(type: Test, dependsOn: noJdk7TestClasses) {
group = "verification"
@@ -115,5 +95,5 @@ task testNoJdk7(type: Test, dependsOn: noJdk7TestClasses) {
classpath = sourceSets.noJdk7Test.runtimeClasspath
}
check.dependsOn testJdk6Tests, testNoJdk7
check.dependsOn testNoJdk7