Fix output parse

This commit is contained in:
Pavel Punegov
2019-03-27 13:49:52 +03:00
committed by Pavel Punegov
parent ce9f2b7c0b
commit e6a391f024
2 changed files with 5 additions and 8 deletions
+2 -2
View File
@@ -2237,8 +2237,8 @@ task multiargs(type: RunStandaloneKonanTest) {
arguments = ["AAA", "BB", "C"]
multiRuns = true
multiArguments = [["1", "2", "3"], ["---"], ["Hello", "world"]]
goldValue = "AAA\nBB\nC\n1\n2\n3" +
"AAA\nBB\nC\n---" +
goldValue = "AAA\nBB\nC\n1\n2\n3\n" +
"AAA\nBB\nC\n---\n" +
"AAA\nBB\nC\nHello\nworld\n"
source = "runtime/basic/args0.kt"
}
@@ -287,7 +287,6 @@ abstract class KonanTest extends JavaExec {
def times = multiRuns ? multiArguments.size() : 1
def result = compilerMessagesText
def exitCodeMismatch = false
for (int i = 0; i < times; i++) {
ExecResult execResult = project.execute {
@@ -307,9 +306,6 @@ abstract class KonanTest extends JavaExec {
ignoreExitValue = true
}
def currentResult = out.toString("UTF-8")
println(currentResult)
result += currentResult
exitCodeMismatch |= execResult.exitValue != expectedExitStatus
if (exitCodeMismatch) {
@@ -317,11 +313,12 @@ abstract class KonanTest extends JavaExec {
if (this.expectedFail) {
println("Expected failure. $message")
} else {
throw new TestFailedException("Test failed on iteration $i. $message")
throw new TestFailedException("Test failed on iteration $i. $message\n ${out.toString("UTF-8")}")
}
}
}
def result = compilerMessagesText + out.toString("UTF-8")
println(result)
result = result.replace(System.lineSeparator(), "\n")
def goldValueMismatch = !outputChecker.apply(result)
if (goldValueMismatch) {