From 79b81d846ef85dc6ccbc38fe221fe8698003b5b7 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 16 Apr 2015 16:16:37 +0300 Subject: [PATCH] fix and improve check for TARGET_BACKEND for generated tests --- .../tests/generator/SimpleTestMethodModel.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java index 874269c1739..283290f3b12 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java @@ -32,6 +32,8 @@ import java.util.regex.Pattern; import static org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend; public class SimpleTestMethodModel implements TestMethodModel { + private static final String DIRECTIVES_FILE_NAME = "directives.txt"; + @NotNull private final File rootDir; @NotNull @@ -73,7 +75,16 @@ public class SimpleTestMethodModel implements TestMethodModel { if (targetBackend == TargetBackend.ANY) return false; try { - String fileText = FileUtil.loadFile(file); + String fileText; + if (file.isDirectory()) { + File directivesFile = new File(file, DIRECTIVES_FILE_NAME); + if (!directivesFile.exists()) return false; + + fileText = FileUtil.loadFile(directivesFile); + } + else { + fileText = FileUtil.loadFile(file); + } List backends = InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, "// TARGET_BACKEND: "); return backends.size() > 0 && !targetBackend.name().equals(backends.get(0)); } catch (IOException e) {