From 1b241e04b29445723ebd4dcd6c53e27923458549 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Thu, 23 Dec 2021 14:55:05 +0300
Subject: [PATCH] [Native][tests] Extend logged environment variables and JVM
 properties

---
 .../konan/blackboxtest/support/util/SafeEnvironment.kt       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SafeEnvironment.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SafeEnvironment.kt
index e2d9cdeb056..0f9fe48f999 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SafeEnvironment.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/SafeEnvironment.kt
@@ -37,7 +37,7 @@ internal object SafeEnvVars : Iterable<NameAndSafeValue> {
 
     private const val KONAN_WORD = "KONAN"
 
-    private val SAFE_ENV_VARS = setOf("PATH", "USER", "LANG", "PWD", "TEMP", "TMP")
+    private val SAFE_ENV_VARS = setOf("PATH", "USER", "LANG", "PWD", "TEMP", "TMP", "GRADLE_OPTS")
     private val SAFE_ENV_VAR_PREFIXES = listOf("JAVA_", "JDK_")
     private val SAFE_ENV_VAR_SUFFIXES = listOf("DIR", "DIRS", "HOME", "ROOT", "PATH", "FILE")
 }
@@ -75,6 +75,9 @@ internal class SafeProperties : Iterable<NameAndSafeValue> {
             "org.gradle.",
             "org.jetbrains.",
             "os.",
+            "sun.arch.",
+            "sun.cpu.",
+            "sun.os.",
             "psi.",
             "user."
         )