From e2a613d832e1566806188985c8c2347297c5314e Mon Sep 17 00:00:00 2001
From: Pavel Punegov <32519625+PavelPunegov@users.noreply.github.com>
Date: Mon, 17 Jun 2019 16:15:22 +0300
Subject: [PATCH] Fix external tests: change test task filter to get type of
 the test

---
 backend.native/tests/build.gradle | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 90806c67f14..31f624ba3ca 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -167,16 +167,16 @@ clean {
     }
 }
 
-TaskCollection<KonanTest> tasksOf(Closure<Boolean> filter) {
+TaskCollection<Task> tasksOf(Class<? extends Task> type, Closure<Boolean> filter) {
     String prefix = project.findProperty("prefix")
-    project.tasks.withType(KonanTest)
+    project.tasks.withType(type)
             .matching { filter(it) && it.enabled && (prefix != null ? it.name.startsWith(prefix) : true) }
 }
 
 run {
-    dependsOn(tasksOf { it instanceof KonanLocalTest ||
+    dependsOn(tasksOf(KonanTest.class, { it instanceof KonanLocalTest ||
             it instanceof KonanStandaloneTest // includes driver, interop and library tests
-    })
+    }))
     // Add framework tests
     dependsOn(project.tasks.withType(FrameworkTest))
 }
@@ -187,9 +187,9 @@ task sanity {
             update_external_tests()
         }
     }
-    dependsOn(tasksOf { (it instanceof KonanLocalTest || it instanceof KonanStandaloneTest) &&
-            !it.getDependsOn().contains(':distPlatformLibs') })
-    dependsOn(tasksOf { it instanceof KonanGTest })
+    dependsOn(tasksOf(KonanTest.class, { (it instanceof KonanLocalTest || it instanceof KonanStandaloneTest) &&
+            !it.getDependsOn().contains(':distPlatformLibs') }))
+    dependsOn(tasksOf(KonanTest.class, { it instanceof KonanGTest }))
 }
 
 // Collect reports in one json.
@@ -352,7 +352,7 @@ task run_external () {
     createTestTasks(externalTestsDir, RunExternalTestGroup) { }
 
     // Set up dependencies.
-    dependsOn(tasksOf { it instanceof RunExternalTestGroup || it instanceof KonanGTest })
+    dependsOn(tasksOf(OldKonanTest.class, { it instanceof RunExternalTestGroup || it instanceof KonanGTest }))
 }
 
 task daily() {