Skip to content

Commit cc15ce0

Browse files
committed
chore(gradle): add option to skip integration tests
Calling the test task with "-Pnointegration" will now skip integration tests # Conflicts: # server/src/sc/server/Lobby.kt # server/src/sc/server/network/ClientManager.java # server/src/sc/server/network/NewClientListener.java
1 parent 1033632 commit cc15ce0

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

gradle/build.gradle.kts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@ tasks {
140140
println("Waiting for client $i to receive game result")
141141
do {
142142
if (!server.isAlive) {
143-
if(!timeout.get())
143+
if (!timeout.get())
144144
throw Exception("Server terminated unexpectedly!")
145145
return@doFirst
146146
}
147147
Thread.yield()
148148
Thread.sleep(100)
149149
log = logFile.readText()
150150
} while (!log.contains("stop", true))
151-
if(!log.contains("Received game result"))
151+
if (!log.contains("Received game result"))
152152
throw Exception("Client $i did not receive the game result - check $logFile")
153153
}
154154
} catch (t: Throwable) {
@@ -193,9 +193,6 @@ tasks {
193193
}
194194

195195
val integrationTest by creating {
196-
enabled = versionObject.minor > 0
197-
if (enabled)
198-
dependsOn(testGame, testTestClient)
199196
group = mainGroup
200197
}
201198

@@ -205,7 +202,8 @@ tasks {
205202
}
206203
test {
207204
dependOnSubprojects()
208-
dependsOn(integrationTest)
205+
if (!hasProperty("nointegration") && versionObject.minor > 0)
206+
dependsOn(integrationTest)
209207
group = mainGroup
210208
}
211209
build {

0 commit comments

Comments
 (0)