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

fix and improve check for TARGET_BACKEND for generated tests

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-04-16 16:16:37 +03:00
parent f48a8d206a
commit 79b81d846e
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java
+12 -1
View File
@@ -32,6 +32,8 @@ import java.util.regex.Pattern;
import static org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend; import static org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend;
public class SimpleTestMethodModel implements TestMethodModel { public class SimpleTestMethodModel implements TestMethodModel {
private static final String DIRECTIVES_FILE_NAME = "directives.txt";
@NotNull @NotNull
private final File rootDir; private final File rootDir;
@NotNull @NotNull
@@ -73,7 +75,16 @@ public class SimpleTestMethodModel implements TestMethodModel {
if (targetBackend == TargetBackend.ANY) return false; if (targetBackend == TargetBackend.ANY) return false;
try { 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<String> backends = InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, "// TARGET_BACKEND: "); List<String> backends = InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, "// TARGET_BACKEND: ");
return backends.size() > 0 && !targetBackend.name().equals(backends.get(0)); return backends.size() > 0 && !targetBackend.name().equals(backends.get(0));
} catch (IOException e) { } catch (IOException e) {