Put kotlin-stdlib-jdk7/8 output in test classpath when running jdk6 tests
These tests ensure how compiled jdk6 binaries work in newer JDK7/8 environment,
and most likely the stdlib-jdk7/8 artifacts will be in that environment.
This reverts test classpath change (accidentally?) made in the commit 99f2cc3d.
This commit is contained in:
@@ -101,7 +101,7 @@ task testJdk6Tests(type: Test) {
|
|||||||
testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output
|
testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output
|
||||||
classpath = files(
|
classpath = files(
|
||||||
testClassesDirs,
|
testClassesDirs,
|
||||||
configurations.testCompile
|
sourceSets.test.compileClasspath
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ task testJdk6Tests(type: Test) { thisTask ->
|
|||||||
testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output
|
testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output
|
||||||
classpath = files(
|
classpath = files(
|
||||||
testClassesDirs,
|
testClassesDirs,
|
||||||
configurations.testCompile
|
sourceSets.test.compileClasspath
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user