From 9633a09c07069dba8592c23310bcdfce687aed42 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <32519625+PavelPunegov@users.noreply.github.com>
Date: Fri, 20 Oct 2017 17:08:11 +0300
Subject: [PATCH] Exclude tests that could not be used with TestRunner
 automatically

---
 backend.native/tests/build.gradle | 55 ++++++++++---------------------
 1 file changed, 18 insertions(+), 37 deletions(-)

diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 986fdc4d589..5f99cdcd7cf 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -179,43 +179,6 @@ task slackReport(type:Reporter) {
     reportHome = rootProject.file("test.output").absoluteFile
 }
 
-task buildKonanTests(type: BuildKonanTest) {
-    compileList = [ "codegen",  "datagen", "lower", "runtime", "serialization"]
-    // TODO: move these tests into separate dirs or create this list during build
-    // These tests should not be built into the TestRunner's test executable
-    excludeList = [
-            // Driver tests
-            "runtime/basic/driver0.kt",
-            // Standalone tests
-            "runtime/basic/args0.kt",
-            "runtime/basic/exit.kt",
-            "runtime/basic/hello1.kt",
-            "runtime/basic/hello2.kt",
-            "runtime/basic/entry0.kt",
-            "runtime/basic/entry1.kt",
-            "runtime/basic/assert_failed.kt",
-            "runtime/basic/assert_passed.kt",
-            "runtime/basic/assert_failed.kt",
-            "runtime/basic/initializers2.kt",
-            "runtime/memory/basic0.kt",
-            // Link tests
-            "runtime/basic/entry2.kt",
-            "runtime/basic/libentry2.kt",
-            "codegen/enum/linkTest_main.kt",
-            "codegen/enum/linkTest_lib.kt",
-            "codegen/inline/defaultArgs_linkTest_main.kt",
-            "codegen/inline/defaultArgs_linkTest_lib.kt",
-            "serialization/serialize_members.kt",
-            "serialization/deserialize_members.kt",
-            "codegen/propertyCallableReference/linkTest_main.kt",
-            "codegen/propertyCallableReference/linkTest_lib.kt",
-            "codegen/bridges/linkTest_main.kt",
-            "codegen/bridges/linkTest_lib.kt",
-            "codegen/delegatedProperty/delegatedOverride_main.kt",
-            "codegen/delegatedProperty/delegatedOverride_lib.kt"
-    ]
-}
-
 task sum (type:RunKonanTest) {
     source = "codegen/function/sum.kt"
 }
@@ -2272,3 +2235,21 @@ if (isMac()) {
         }
     }
 }
+
+task buildKonanTests(type: BuildKonanTest) {
+    compileList = [ "codegen",  "datagen", "lower", "runtime", "serialization"]
+
+    // These tests should not be built into the TestRunner's test executable
+    excludeList = []
+    project.tasks.withType(KonanTest)
+            .matching { ! (it instanceof RunKonanTest) }
+            .each {
+                // add library and source files
+                if (it instanceof LinkKonanTest) {
+                    excludeList += it.lib
+                }
+                if (it.source != null) {
+                    excludeList += it.source
+                }
+            }
+}