azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logic related to command-line options moved to android-compiler-plugin

Browse Source
This commit is contained in:
Andrey Breslav
2014-09-23 18:23:39 +04:00
committed by Yan Zhulanow
parent febfdde89e
commit 1e70369cf8
11 changed files with 152 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBoxTest.kt
+3 -2
View File
@@ -31,6 +31,7 @@ import com.intellij.util.Processor
import org.jetbrains.jet.codegen.CodegenTestFiles
import java.util.regex.Pattern
import org.jetbrains.jet.config.CompilerConfiguration
import org.jetbrains.kotlin.android.AndroidConfigurationKeys
public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() {
@@ -43,8 +44,8 @@ public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() {
}
private fun createEnvironmentForConfiguration(configuration: CompilerConfiguration, path: String) {
configuration.put(JVMConfigurationKeys.ANDROID_RES_PATH, path + "layout/");
configuration.put(JVMConfigurationKeys.ANDROID_MANIFEST, path + "AndroidManifest.xml");
configuration.put(AndroidConfigurationKeys.ANDROID_RES_PATH, path + "layout/");
configuration.put(AndroidConfigurationKeys.ANDROID_MANIFEST, path + "AndroidManifest.xml");
myEnvironment = JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration);
}
compiler/tests/org/jetbrains/jet/lang/resolve/android/AbstractAndroidBytecodePersistenceTest.kt
+3 -2
View File
@@ -23,6 +23,7 @@ import org.jetbrains.jet.TestJdkKind
import org.jetbrains.jet.config.CompilerConfiguration
import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
import org.jetbrains.kotlin.android.AndroidConfigurationKeys
public abstract class AbstractAndroidBytecodePersistenceTest : AbstractBytecodeTextTest() {
@@ -35,8 +36,8 @@ public abstract class AbstractAndroidBytecodePersistenceTest : AbstractBytecodeT
}
private fun createEnvironmentForConfiguration(configuration: CompilerConfiguration, path: String) {
configuration.put(JVMConfigurationKeys.ANDROID_RES_PATH, path + "res/layout/");
configuration.put(JVMConfigurationKeys.ANDROID_MANIFEST, path + "../AndroidManifest.xml");
configuration.put(AndroidConfigurationKeys.ANDROID_RES_PATH, path + "res/layout/");
configuration.put(AndroidConfigurationKeys.ANDROID_MANIFEST, path + "../AndroidManifest.xml");
myEnvironment = JetCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration);
}
public override fun doTest(path: String) {