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

build/tests: support KonanTest.expectedExitStatus

Browse Source
This commit is contained in:
Svyatoslav Scherbina
2017-03-10 13:12:38 +07:00
committed by SvyatoslavScherbina
parent 853a40b230
commit 051f42667c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+10 -1
View File
@@ -5,6 +5,7 @@ import org.gradle.api.DefaultTask
import org.gradle.api.tasks.JavaExec import org.gradle.api.tasks.JavaExec
import org.gradle.api.tasks.ParallelizableTask import org.gradle.api.tasks.ParallelizableTask
import org.gradle.api.tasks.TaskAction import org.gradle.api.tasks.TaskAction
import org.gradle.process.ExecResult
abstract class KonanTest extends JavaExec { abstract class KonanTest extends JavaExec {
protected String source protected String source
@@ -20,6 +21,7 @@ abstract class KonanTest extends JavaExec {
String outputDirectory = null String outputDirectory = null
String goldValue = null String goldValue = null
String testData = null String testData = null
int expectedExitStatus = 0
List<String> arguments = null List<String> arguments = null
boolean enabled = true boolean enabled = true
@@ -143,7 +145,7 @@ abstract class KonanTest extends JavaExec {
def out = null def out = null
//TODO Add test timeout //TODO Add test timeout
project.exec { ExecResult execResult = project.exec {
commandLine exe commandLine exe
if (arguments != null) { if (arguments != null) {
args arguments args arguments
@@ -156,7 +158,14 @@ abstract class KonanTest extends JavaExec {
standardOutput = out standardOutput = out
} }
ignoreExitValue = true
} }
if (execResult.exitValue != expectedExitStatus) {
throw new TestFailedException(
"Test failed. Expected exit status: $expectedExitStatus, actual: ${execResult.exitValue}")
}
if (goldValue != null && goldValue != out.toString()) { if (goldValue != null && goldValue != out.toString()) {
throw new TestFailedException("Test failed. Expected output: $goldValue, actual output: ${out.toString()}") throw new TestFailedException("Test failed. Expected output: $goldValue, actual output: ${out.toString()}")
} }