Fix dependencies filters: add default argument

This commit is contained in:
Pavel Punegov
2020-03-19 19:57:58 +03:00
committed by Pavel Punegov
parent f29b52764a
commit cc6026d4ed
+4 -4
View File
@@ -218,16 +218,16 @@ clean {
} }
} }
TaskCollection<Task> tasksOf(Class<? extends Task> type, Closure<Boolean> filter) { TaskCollection<Task> tasksOf(Class<? extends Task> type, Closure<Boolean> filter = { return true }) {
String prefix = project.findProperty("prefix") String prefix = project.findProperty("prefix")
project.tasks.withType(type) project.tasks.withType(type)
.matching { filter(it) && it.enabled && (prefix != null ? it.name.startsWith(prefix) : true) } .matching { filter(it) && it.enabled && (prefix != null ? it.name.startsWith(prefix) : true) }
} }
run { run {
dependsOn(tasksOf(KonanTest) {}) dependsOn(tasksOf(KonanTest))
// Add framework tests // Add framework tests
dependsOn(tasksOf(FrameworkTest) {}) dependsOn(tasksOf(FrameworkTest))
} }
task sanity { task sanity {
@@ -406,7 +406,7 @@ task run_external () {
createTestTasks(externalTestsDir, RunExternalTestGroup) { } createTestTasks(externalTestsDir, RunExternalTestGroup) { }
// Set up dependencies. // Set up dependencies.
dependsOn(tasksOf(RunExternalTestGroup) {}) dependsOn(tasksOf(RunExternalTestGroup))
dependsOn("stdlibTest") dependsOn("stdlibTest")
} }