From 99f2cc3d00078d3478db761b23f56584661ce837 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 13 Sep 2017 07:45:11 +0300 Subject: [PATCH] Fix paths to stdlib-jre6 test output --- libraries/stdlib/jre7/build.gradle | 11 ++++++++--- libraries/stdlib/jre8/build.gradle | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle index 587872e1979..6f84ac6d3ed 100644 --- a/libraries/stdlib/jre7/build.gradle +++ b/libraries/stdlib/jre7/build.gradle @@ -65,13 +65,18 @@ test { } task testJre6Tests(type: Test) { - dependsOn project(':kotlin-stdlib').tasks.testClasses + dependsOn(':kotlin-stdlib:testClasses') group = "verification" executable = "$JDK_17/bin/java" - testClassesDir = project.file('../build/classes/test') - classpath = project.files('../build/classes/test') + sourceSets.test.compileClasspath + doFirst { + testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output + classpath = files( + testClassesDirs, + configurations.testCompile + ) + } } check.dependsOn testJre6Tests \ No newline at end of file diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle index 99360fbcdcc..7105dd15b83 100644 --- a/libraries/stdlib/jre8/build.gradle +++ b/libraries/stdlib/jre8/build.gradle @@ -68,13 +68,18 @@ test { task testJre6Tests(type: Test) { - dependsOn project(':kotlin-stdlib').tasks.testClasses + dependsOn(':kotlin-stdlib:testClasses') group = "verification" executable = "$JDK_18/bin/java" - testClassesDir = project.file('../build/classes/test') - classpath = project.files('../build/classes/test') + sourceSets.test.compileClasspath + doFirst { + testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output + classpath = files( + testClassesDirs, + configurations.testCompile + ) + } } check.dependsOn testJre6Tests \ No newline at end of file