From bb8c8431e812aea22f9b5395d0dc5deb7fcb8fa9 Mon Sep 17 00:00:00 2001
From: Alexander Shabalin <alexander.shabalin@jetbrains.com>
Date: Mon, 4 Mar 2024 23:03:14 +0100
Subject: [PATCH] [K/N][tests] Move gradle stuff for old infra to old infra

---
 .../backend.native/tests/build.gradle         | 39 ++++++++++++++++++-
 kotlin-native/build.gradle                    | 36 -----------------
 kotlin-native/runtime/build.gradle.kts        |  1 -
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle
index 65e79ebd1e3..a21ff02bda1 100644
--- a/kotlin-native/backend.native/tests/build.gradle
+++ b/kotlin-native/backend.native/tests/build.gradle
@@ -20,6 +20,43 @@ buildscript {
     }
 }
 
+void loadLocalProperties() {
+    if (new File("$project.rootDir/local.properties").exists()) {
+        Properties props = new Properties()
+        props.load(new FileInputStream("$project.rootDir/local.properties"))
+        props.each { prop -> project.ext.set(prop.key, prop.value) }
+    }
+}
+
+void loadCommandLineProperties() {
+    if (project.hasProperty("konanc_flags")) {
+        throw new Error("Specify either -Ptest_flags or -Pbuild_flags.")
+    }
+
+    ext.globalBuildArgs = new ArrayList<String>()
+    if (project.hasProperty("build_flags")) {
+        for (String flag : ext.build_flags.toString().split("\\s")) {
+            flag = flag.trim()
+            if (!flag.isEmpty()) ext.globalBuildArgs.add(flag)
+        }
+    }
+
+    ext.globalTestArgs = new ArrayList<String>()
+    ext.globalTestArgs.add("-Xpartial-linkage=enable")
+    ext.globalTestArgs.add("-Xpartial-linkage-loglevel=error")
+    if (project.hasProperty("test_flags")) {
+        for (String flag : ext.test_flags.toString().split("\\s")) {
+            flag = flag.trim()
+            if (!flag.isEmpty()) ext.globalTestArgs.add(flag)
+        }
+    }
+
+    ext.testTarget = project.hasProperty("test_target") ? ext.test_target : PlatformInfo.hostName
+}
+
+loadCommandLineProperties()
+loadLocalProperties()
+
 apply plugin: 'konan'
 apply plugin: 'kotlin'
 apply plugin: 'kotlin.native.build-tools-conventions'
@@ -1235,7 +1272,7 @@ dynamicTest("interop_kotlin_exception_hook") {
 }
 
 standaloneTest("kt51302") {
-    enabled = project.target.name == project.hostName
+    enabled = project.target.name == PlatformInfo.hostName
     source = "serialization/KT-51302/main.kt"
     flags = ["-l", "$projectDir/serialization/KT-51302/kt51302_dependency"]
 }
diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle
index f7af8aada78..4234a41d501 100644
--- a/kotlin-native/build.gradle
+++ b/kotlin-native/build.gradle
@@ -88,8 +88,6 @@ allprojects {
     }
 
     setupHostAndTarget()
-    loadCommandLineProperties()
-    loadLocalProperties()
     setupClang(project)
 }
 
@@ -104,40 +102,6 @@ void setupClang(Project project) {
     project.extensions.execClang = org.jetbrains.kotlin.ExecClang.create(project)
 }
 
-void loadLocalProperties() {
-    if (new File("$project.rootDir/local.properties").exists()) {
-        Properties props = new Properties()
-        props.load(new FileInputStream("$project.rootDir/local.properties"))
-        props.each { prop -> project.ext.set(prop.key, prop.value) }
-    }
-}
-
-void loadCommandLineProperties() {
-    if (project.hasProperty("konanc_flags")) {
-        throw new Error("Specify either -Ptest_flags or -Pbuild_flags.")
-    }
-
-    ext.globalBuildArgs = new ArrayList<String>()
-    if (project.hasProperty("build_flags")) {
-        for (String flag : ext.build_flags.toString().split("\\s")) {
-            flag = flag.trim()
-            if (!flag.isEmpty()) ext.globalBuildArgs.add(flag)
-        }
-    }
-
-    ext.globalTestArgs = new ArrayList<String>()
-    ext.globalTestArgs.add("-Xpartial-linkage=enable")
-    ext.globalTestArgs.add("-Xpartial-linkage-loglevel=error")
-    if (project.hasProperty("test_flags")) {
-        for (String flag : ext.test_flags.toString().split("\\s")) {
-            flag = flag.trim()
-            if (!flag.isEmpty()) ext.globalTestArgs.add(flag)
-        }
-    }
-
-    ext.testTarget = project.hasProperty("test_target") ? ext.test_target : ext.hostName
-}
-
 configurations {
     ftpAntTask
     distPack
diff --git a/kotlin-native/runtime/build.gradle.kts b/kotlin-native/runtime/build.gradle.kts
index 70714e38fb5..75f4a8c8b0e 100644
--- a/kotlin-native/runtime/build.gradle.kts
+++ b/kotlin-native/runtime/build.gradle.kts
@@ -596,7 +596,6 @@ konanArtifacts {
         noDefaultLibs(true)
         noEndorsedLibs(true)
 
-        extraOpts(project.globalBuildArgs)
         extraOpts(
                 "-Werror",
                 "-Xexplicit-api=strict",