From b5d68515e8fc32f676858c2340a8e1c9d36a5162 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 20 Sep 2017 18:24:15 +0200
Subject: [PATCH] Fix path to android-extensions-runtime in ParcelBoxTest

---
 plugins/plugins-tests/build.gradle.kts                     | 3 +++
 .../kotlin/android/parcel/AbstractParcelBoxTest.kt         | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/plugins-tests/build.gradle.kts b/plugins/plugins-tests/build.gradle.kts
index c25f38d5bb0..b62938c7aa1 100644
--- a/plugins/plugins-tests/build.gradle.kts
+++ b/plugins/plugins-tests/build.gradle.kts
@@ -38,7 +38,10 @@ sourceSets {
 
 testsJar {}
 
+evaluationDependsOn(":kotlin-android-extensions-runtime")
+
 projectTest {
+    environment("ANDROID_EXTENSIONS_RUNTIME_CLASSES", getSourceSetsFrom(":kotlin-android-extensions-runtime")["main"].output.classesDirs.asPath)
     dependsOnTaskIfExistsRec("dist", project = rootProject)
     workingDir = rootDir
 }
diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/parcel/AbstractParcelBoxTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/parcel/AbstractParcelBoxTest.kt
index 50b754fee4b..0b5b15e3cc3 100644
--- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/parcel/AbstractParcelBoxTest.kt
+++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/parcel/AbstractParcelBoxTest.kt
@@ -117,9 +117,12 @@ abstract class AbstractParcelBoxTest : CodegenTestCase() {
         val junitCoreResourceName = JUnitCore::class.java.name.replace('.', '/') + ".class"
         val junitJar = File(JUnitCore::class.java.classLoader.getResource(junitCoreResourceName).file.substringBeforeLast('!'))
 
-        val androidExtensionsRuntime = File("out/production/android-extensions-runtime")
+        val androidExtensionsRuntimeCP =
+                (System.getenv("ANDROID_EXTENSIONS_RUNTIME_CLASSES")?.split(File.pathSeparator)
+                    ?: listOf("out/production/android-extensions-runtime")
+                ).map { File(it) }
 
-        return listOf(kotlinRuntimeJar) + layoutLibJars + robolectricJars + junitJar + androidExtensionsRuntime
+        return listOf(kotlinRuntimeJar) + layoutLibJars + robolectricJars + junitJar + androidExtensionsRuntimeCP
     }
 
     override fun doMultiFileTest(wholeFile: File, files: List<TestFile>, javaFilesDir: File?) {