Unverified Commit c56c5991 authored by Thomas Mortagne's avatar Thomas Mortagne Committed by GitHub
Browse files

Merge pull request #200 from michitux/XRENDERING-639

parents 153dd915 da1fa26b
...@@ -139,9 +139,13 @@ public List<TestData> parseSingleTestData(String syntaxDirectory, String ctsRoot ...@@ -139,9 +139,13 @@ public List<TestData> parseSingleTestData(String syntaxDirectory, String ctsRoot
// If the inherit configuration property is set and if the returned syntax is empty load from the inherit // If the inherit configuration property is set and if the returned syntax is empty load from the inherit
// syntax. // syntax.
if (configuration.inheritSyntax != null) { TestDataConfiguration currentConfiguration = configuration;
while ((testDataIN.syntaxData == null || testDataOUT.syntaxData == null)
&& currentConfiguration.inheritSyntax != null) {
final String inheritedSyntaxDirectory = computeSyntaxDirectory(currentConfiguration.inheritSyntax);
Pair<Pair<String, String>, Pair<String, String>> inheritedSyntaxData = Pair<Pair<String, String>, Pair<String, String>> inheritedSyntaxData =
readDataForPrefix(computeSyntaxDirectory(configuration.inheritSyntax) + SLASH + relativeDirectoryName, readDataForPrefix(inheritedSyntaxDirectory + SLASH + relativeDirectoryName,
configuration.fileExtension, classLoader); configuration.fileExtension, classLoader);
if (testDataIN.syntaxData == null) { if (testDataIN.syntaxData == null) {
testDataIN.syntaxData = inheritedSyntaxData.getLeft().getLeft(); testDataIN.syntaxData = inheritedSyntaxData.getLeft().getLeft();
...@@ -151,6 +155,13 @@ public List<TestData> parseSingleTestData(String syntaxDirectory, String ctsRoot ...@@ -151,6 +155,13 @@ public List<TestData> parseSingleTestData(String syntaxDirectory, String ctsRoot
testDataOUT.syntaxData = inheritedSyntaxData.getRight().getLeft(); testDataOUT.syntaxData = inheritedSyntaxData.getRight().getLeft();
testDataOUT.syntaxExtension = inheritedSyntaxData.getRight().getRight(); testDataOUT.syntaxExtension = inheritedSyntaxData.getRight().getRight();
} }
try {
currentConfiguration = parseTestConfiguration(inheritedSyntaxDirectory, ctsRootPackageName,
classLoader);
} catch (Exception ignored) {
break;
}
} }
List<TestData> result = new ArrayList<>(); List<TestData> result = new ArrayList<>();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment