revert changes in kotlin-native:backend.native:tests

kotlin-native/backend.native/tests/build.gradle

diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle
index 25b483f..fc58f5c 100644
--- a/kotlin-native/backend.native/tests/build.gradle
+++ b/kotlin-native/backend.native/tests/build.gradle
@@ -224,7 +224,7 @@
 /**
  * Creates a task for a standalone test. Configures runner and adds building task.
  */
-TaskProvider<KonanStandaloneTest> standaloneTest(String name, Closure configureClosure) {
+Task standaloneTest(String name, Closure configureClosure) {
     return KotlinNativeTestKt.createTest(project, name, KonanStandaloneTest) { task ->
         task.configure(configureClosure)
         if (task.enabled) {
@@ -243,7 +243,7 @@
 /**
  * Creates a task for a linking test. Configures runner and adds library and test build tasks.
  */
-TaskProvider<KonanLinkTest> linkTest(String name, Closure<KonanLinkTest> configureClosure) {
+Task linkTest(String name, Closure<KonanLinkTest> configureClosure) {
     return KotlinNativeTestKt.createTest(project, name, KonanLinkTest) { task ->
         task.configure(configureClosure)
         if (task.enabled) {
@@ -277,7 +277,7 @@
 /**
  * Creates a task for a dynamic test. Configures runner and adds library and test build tasks.
  */
-TaskProvider<KonanDynamicTest> dynamicTest(String name, Closure<KonanDynamicTest> configureClosure) {
+Task dynamicTest(String name, Closure<KonanDynamicTest> configureClosure) {
     return KotlinNativeTestKt.createTest(project, name, KonanDynamicTest) { task ->
         task.configure(configureClosure)
         if (task.enabled) {
@@ -1326,17 +1326,17 @@
     source = "codegen/localClass/tryCatch.kt"
 }
 
-task function_localFunction(type: KonanLocalTest) {
+tasks.register("function_localFunction", KonanLocalTest) {
     useGoldenData = true
     source = "codegen/function/localFunction.kt"
 }
 
-task function_localFunction2(type: KonanLocalTest) {
+tasks.register("function_localFunction2", KonanLocalTest) {
     useGoldenData = true
     source = "codegen/function/localFunction2.kt"
 }
 
-task function_localFunction3(type: KonanLocalTest) {
+tasks.register("function_localFunction3", KonanLocalTest) {
     useGoldenData = true
     source = "codegen/function/localFunction3.kt"
 }
@@ -4147,7 +4147,7 @@
 /**
  * Creates a task for the interop test. Configures runner and adds library and test build tasks.
  */
-TaskProvider<KonanInteropTest> interopTestBase(String name, boolean multiFile, Closure<KonanInteropTest> configureClosure) {
+Task interopTestBase(String name, boolean multiFile, Closure<KonanInteropTest> configureClosure) {
     return KotlinNativeTestKt.createTest(project, name, KonanInteropTest) { task ->
         task.configure(configureClosure)
         if (task.enabled) {
@@ -4193,11 +4193,11 @@
     }
 }
 
-TaskProvider<KonanInteropTest> interopTest(String name, Closure<KonanInteropTest> configureClosure) {
+Task interopTest(String name, Closure<KonanInteropTest> configureClosure) {
     return interopTestBase(name, false, configureClosure)
 }
 
-TaskProvider<KonanInteropTest> interopTestMultifile(String name, Closure<KonanInteropTest> configureClosure) {
+Task interopTestMultifile(String name, Closure<KonanInteropTest> configureClosure) {
     return interopTestBase(name, true, configureClosure)
 }
 
@@ -5191,7 +5191,7 @@
     useGoldenData = true
 }
 
-TaskProvider<FrameworkTest> frameworkTest(String name, Closure<FrameworkTest> configurator) {
+Task frameworkTest(String name, Closure<FrameworkTest> configurator) {
     return KotlinNativeTestKt.createTest(project, name, FrameworkTest) { task ->
         configurator.delegate = task
         UtilsKt.dependsOnDist(task)
@@ -5228,7 +5228,7 @@
     }
 }
 
-TaskProvider<FrameworkTest> objcExportTest(
+Task objcExportTest(
         Task allTask,
         String suffix,
         List<String> frameworkOpts,
@@ -5240,7 +5240,7 @@
     final String name = "testObjCExport$suffix"
     final String frameworkName = "Kt$suffix"
     final String expectedLazyHeaderName = "expectedLazy${suffix}.h"
-    final TaskProvider<FrameworkTest> task = frameworkTest(name) {
+    final Task task = frameworkTest(name) {
         final String dir = "$testOutputFramework/$name"
         final File lazyHeader = file("$dir/$target-lazy.h")
         lazyHeader.delete()  // Clean up after previous runs
@@ -5837,8 +5837,8 @@
 }
 
 
-TaskProvider<FileCheckTest> fileCheckTest(String name, Closure<FileCheckTest> configureClosure) {
-    return project.tasks.register(name, FileCheckTest) { task ->
+Task fileCheckTest(String name, Closure<FileCheckTest> configureClosure) {
+    return project.tasks.create(name, FileCheckTest) { task ->
         task.configure(configureClosure)
         task.llvmIr = project.file("$testOutputFileCheck/$name/$target/out.${task.phaseToCheck}.ll")
 

kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt

diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
index 4d1df42..71adaf8 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt
@@ -128,8 +128,8 @@
 /**
  * Create a test task of the given type. Supports configuration with Closure passed form build.gradle file.
  */
-fun <T : KonanTestExecutable> Project.createTest(name: String, type: Class<T>, config: Closure<*>): TaskProvider<T> =
-        project.tasks.register(name, type) {
+fun <T : KonanTestExecutable> Project.createTest(name: String, type: Class<T>, config: Closure<*>): T =
+        project.tasks.create(name, type).apply {
             // Apply closure set in build.gradle to get all parameters.
             this.configure(config)
             if (enabled) {