Fix and simplify dependencies

This commit is contained in:
Pavel Punegov
2020-03-16 22:38:55 +03:00
committed by Pavel Punegov
parent c5576ad64e
commit a4328b9215
+6 -9
View File
@@ -225,11 +225,9 @@ TaskCollection<Task> tasksOf(Class<? extends Task> type, Closure<Boolean> filter
} }
run { run {
dependsOn(tasksOf(KonanTest.class, { it instanceof KonanLocalTest || dependsOn(tasksOf(KonanTest) {})
it instanceof KonanStandaloneTest // includes driver, interop and library tests
}))
// Add framework tests // Add framework tests
dependsOn(project.tasks.withType(FrameworkTest)) dependsOn(tasksOf(FrameworkTest) {})
} }
task sanity { task sanity {
@@ -238,13 +236,11 @@ task sanity {
update_external_tests() update_external_tests()
} }
} }
def platformLibsTasks = targetList.collect { "${it}PlatformLibs" } + ["distPlatformLibs"] def platformLibsTasks = targetList.collect { ":${it}PlatformLibs" } + ":distPlatformLibs"
dependsOn(tasksOf(KonanTest.class) { task -> dependsOn(tasksOf(KonanTest) { task ->
(task instanceof KonanLocalTest || task instanceof KonanStandaloneTest) &&
task.getDependsOn().every { !platformLibsTasks.contains(it) } && task.getDependsOn().every { !platformLibsTasks.contains(it) } &&
task.name != "library_mismatch" // This test requires the wasm32 stdlib which is unavailable during a sanity run. task.name != "library_mismatch" // This test requires the wasm32 stdlib which is unavailable during a sanity run.
}) })
dependsOn(tasksOf(KonanTest.class, { it instanceof KonanGTest }))
} }
// Collect reports in one json. // Collect reports in one json.
@@ -410,7 +406,8 @@ task run_external () {
createTestTasks(externalTestsDir, RunExternalTestGroup) { } createTestTasks(externalTestsDir, RunExternalTestGroup) { }
// Set up dependencies. // Set up dependencies.
dependsOn(tasksOf(OldKonanTest.class, { it instanceof RunExternalTestGroup || it instanceof KonanGTest })) dependsOn(tasksOf(RunExternalTestGroup) {})
dependsOn("stdlibTest")
} }
task daily() { task daily() {