From c5982e7ff5374028ff132fc5da0fe156dcd6fcf6 Mon Sep 17 00:00:00 2001
From: Cuihtlauac Alvarado <cuihtlauac@users.noreply.github.com>
Date: Tue, 16 Jan 2018 12:33:19 +0100
Subject: [PATCH] Avoid pick environement variables test failures (#1467)

Remove all lines containing a "Picked up <ENVIRONMENT_VARIALBE>: ..."

Remove empty ERR: section

FIX: KT-22241
---
 .../jetbrains/kotlin/integration/KotlinIntegrationTestBase.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
index bda35e37394..1f490735c68 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
@@ -83,6 +83,8 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir {
         content = content.replaceAll(Pattern.quote(KotlinCompilerVersion.VERSION), "[KotlinVersion]");
         content = content.replaceAll("\\(JRE .+\\)", "(JRE [JREVersion])");
         content = StringUtil.convertLineSeparators(content);
+        content = content.replaceAll("\n.*Picked up [_A-Z]+:.*\n", "\n");
+        content = content.replaceFirst("\nERR:\n\nReturn code:", "\nReturn code:");
         return content;
     }