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

Improve output checker: default one checks with goldOutput

Browse Source
This commit is contained in:
Pavel Punegov
2019-02-13 14:28:11 +03:00
committed by Pavel Punegov
parent 1473565d33
commit d753da7829
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+9 -4
View File
@@ -40,7 +40,8 @@ abstract class KonanTest extends JavaExec {
def enableKonanAssertions = true
String outputDirectory = null
String goldValue = null
Function<String, Boolean> outputChecker = null
// Checks test's output against gold value and returns true if the output matches the expectation
Function<String, Boolean> outputChecker = { str -> (goldValue == null || goldValue == str) }
String testData = null
int expectedExitStatus = 0
List<String> arguments = null
@@ -309,10 +310,14 @@ abstract class KonanTest extends JavaExec {
}
result = result.replace(System.lineSeparator(), "\n")
def goldValueMismatch = (outputChecker != null && !outputChecker.apply(result)) ||
(goldValue != null && goldValue != result)
def goldValueMismatch = !outputChecker.apply(result)
if (goldValueMismatch) {
def message = "Expected output: $goldValue, actual output: $result"
def message
if (goldValue != null) {
message = "Expected output: $goldValue, actual output: $result"
} else {
message = "Actual output doesn't match output checker: $result"
}
if (this.expectedFail) {
println("Expected failure. $message")
} else {