Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Jenkinsfile: Variable fixes and removal of useless ls line.

Browse Source
This commit is contained in:
/dev/urandom 2016-09-15 21:09:40 +02:00
parent ac289458ce
commit 34950dde3b
No known key found for this signature in database
GPG Key ID: 41322B973E0F295E
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Jenkinsfile vendored
View File

@ -84,7 +84,7 @@ def doBuild(name, wsid, premakeFlags, configuration) {
// This will run the unit tests for IW4x. // This will run the unit tests for IW4x.
// We need a Windows Server with MW2 on it. // We need a Windows Server with MW2 on it.
def doUnitTests(name, wsid) { def doUnitTests(name) {
mw2dir = tool "Modern Warfare 2" mw2dir = tool "Modern Warfare 2"
unstash "$name" unstash "$name"
@ -120,7 +120,6 @@ def doUnitTests(name, wsid) {
// Run tests // Run tests
getIW4xExecutable() getIW4xExecutable()
if (isUnix()) { if (isUnix()) {
sh "ls"
sh "wine-wrapper iw4x.exe -tests" sh "wine-wrapper iw4x.exe -tests"
} else { } else {
bat "iw4x.exe -tests" bat "iw4x.exe -tests"
@ -187,8 +186,8 @@ gitlabBuilds(builds: ["Checkout & Versioning", "Build", "Testing", "Archiving"])
def configuration = configurations[i] def configuration = configurations[i]
executions["$configuration on Windows"] = { executions["$configuration on Windows"] = {
node("windows") { node("windows") {
ws("IW4x/testing/$wsid") { ws("IW4x/testing/$configuration") {
doUnitTests("IW4x $configuration (unit tests)", configuration) doUnitTests("IW4x $configuration (unit tests)")
} }
} }
} }
@ -201,7 +200,7 @@ gitlabBuilds(builds: ["Checkout & Versioning", "Build", "Testing", "Archiving"])
deleteDir() deleteDir()
} }
image.inside { image.inside {
doUnitTests("IW4x $configuration (unit tests)", configuration) doUnitTests("IW4x $configuration (unit tests)")
} }
} }
} }