File tree Expand file tree Collapse file tree 2 files changed +8
-2
lines changed
tests/org/jetbrains/kotlin/android/parcel Expand file tree Collapse file tree 2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,10 @@ sourceSets {
38
38
39
39
testsJar {}
40
40
41
+ evaluationDependsOn(" :kotlin-android-extensions-runtime" )
42
+
41
43
projectTest {
44
+ environment(" ANDROID_EXTENSIONS_RUNTIME_CLASSES" , getSourceSetsFrom(" :kotlin-android-extensions-runtime" )[" main" ].output.classesDirs.asPath)
42
45
dependsOnTaskIfExistsRec(" dist" , project = rootProject)
43
46
workingDir = rootDir
44
47
}
Original file line number Diff line number Diff line change @@ -117,9 +117,12 @@ abstract class AbstractParcelBoxTest : CodegenTestCase() {
117
117
val junitCoreResourceName = JUnitCore ::class .java.name.replace(' .' , ' /' ) + " .class"
118
118
val junitJar = File (JUnitCore ::class .java.classLoader.getResource(junitCoreResourceName).file.substringBeforeLast(' !' ))
119
119
120
- val androidExtensionsRuntime = File (" out/production/android-extensions-runtime" )
120
+ val androidExtensionsRuntimeCP =
121
+ (System .getenv(" ANDROID_EXTENSIONS_RUNTIME_CLASSES" )?.split(File .pathSeparator)
122
+ ? : listOf (" out/production/android-extensions-runtime" )
123
+ ).map { File (it) }
121
124
122
- return listOf (kotlinRuntimeJar) + layoutLibJars + robolectricJars + junitJar + androidExtensionsRuntime
125
+ return listOf (kotlinRuntimeJar) + layoutLibJars + robolectricJars + junitJar + androidExtensionsRuntimeCP
123
126
}
124
127
125
128
override fun doMultiFileTest (wholeFile : File , files : List <TestFile >, javaFilesDir : File ? ) {
You can’t perform that action at this time.
0 commit comments