From ef433d163e63cb12d82ed996becb4dbf101c4ba5 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Mon, 18 Dec 2017 12:27:20 +0100 Subject: [PATCH] Apply common header directives to second file in AbstractCompileKotlinAgainstKotlinTest --- .../codegen/AbstractCompileKotlinAgainstKotlinTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java index e63495e8658..b630e11c567 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java @@ -20,6 +20,7 @@ import com.google.common.collect.Lists; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import kotlin.Pair; +import kotlin.text.StringsKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.cli.common.modules.ModuleBuilder; @@ -113,10 +114,11 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends CodegenTest @NotNull private ClassFileFactory compileB(@NotNull TestFile testFile, List files) throws IOException { + String commonHeader = StringsKt.substringBefore(files.get(0).content, "FILE:", ""); CompilerConfiguration configurationWithADirInClasspath = createConfiguration(ConfigurationKind.ALL, getJdkKind(files), Lists.newArrayList(KotlinTestUtils.getAnnotationsJar(), aDir), - Collections.emptyList(), Collections.singletonList(testFile)); + Collections.emptyList(), Lists.newArrayList(testFile, new TestFile("header", commonHeader))); Disposable compileDisposable = createDisposable("compileB"); KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests(