[Test] Workaround stdlib duplication in AbstractJavaModulesIntegrationTest

These tests invoke CLI compiler and pass the stdlib/reflect as part of
the modular classpath. But at the same time CLI compiler itself adds
stdlib and reflect from `dist`, as `-no-stdlib` flag was not passed.

After setting the `compiler-tests-convention` gradle plugin, stdlib
and reflect paths are set via system property to jars produced by
building corresponding modules, not from `dist`, which caused the
compiler to report warnings about duplicated libraries on the classpath.

The workaround is to use libraries from dist ignoring the environment
properties.

Author: demiurg906

compiler/test-infrastructure-utils/testFixtures/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java

@@ -27,6 +27,16 @@ public static File runtimeJarForTests() {
         return propertyOrDist(KOTLIN_FULL_STDLIB_PATH, "dist/kotlinc/lib/kotlin-stdlib.jar");
     }
 
+    /**
+     * This function left as a workaround for AbstractJavaModulesIntegrationTest
+     * For any other case use `runtimeJarForTests` instead
+     */
+    @NotNull
+    @Deprecated
+    public static File runtimeJarFromDistForTests() {
+        return new File("dist/kotlinc/lib/kotlin-stdlib.jar");
+    }
+
     @NotNull
     public static File runtimeJarForTestsWithJdk8() {
         return propertyOrDist(KOTLIN_FULL_STDLIB_PATH, "dist/kotlinc/lib/kotlin-stdlib-jdk8.jar");
@@ -47,6 +57,16 @@ public static File reflectJarForTests() {
         return propertyOrDist(KOTLIN_REFLECT_JAR_PATH, "dist/kotlinc/lib/kotlin-reflect.jar");
     }
 
+    /**
+     * This function left as a workaround for AbstractJavaModulesIntegrationTest
+     * For any other case use `runtimeJarForTests` instead
+     */
+    @NotNull
+    @Deprecated
+    public static File reflectJarFromDistForTests() {
+        return new File("dist/kotlinc/lib/kotlin-reflect.jar");
+    }
+
     @NotNull
     public static File scriptRuntimeJarForTests() {
         return propertyOrDist(KOTLIN_SCRIPT_RUNTIME_PATH, "dist/kotlinc/lib/kotlin-script-runtime.jar");

compiler/tests-integration/tests/org/jetbrains/kotlin/jvm/modules/AbstractJavaModulesIntegrationTest.kt

@@ -40,7 +40,8 @@ abstract class AbstractJavaModulesIntegrationTest(
         destination: File? = null,
         checkKotlinOutput: (String) -> Unit = this.checkKotlinOutput(name),
     ): File {
-        val paths = (modulePath + ForTestCompileRuntime.runtimeJarForTests()).joinToString(separator = File.pathSeparator) { it.path }
+        @Suppress("DEPRECATION")
+        val paths = (modulePath + ForTestCompileRuntime.runtimeJarFromDistForTests()).joinToString(separator = File.pathSeparator) { it.path }
 
         val kotlinOptions = mutableListOf(
             K2JVMCompilerArguments::jdkHome.cliArgument, jdkHome.path,
@@ -243,20 +244,22 @@ abstract class AbstractJavaModulesIntegrationTest(
         module("main", listOf(d1, d2))
     }
 
+    @Suppress("DEPRECATION")
     fun testDependencyOnStdlib() {
         module("unnamed")
         val namedWithExplicitDependency = module("namedWithExplicitDependency")
         module("namedWithoutExplicitDependency")
         module("namedWithIndirectDependencyViaOtherModule", listOf(namedWithExplicitDependency))
-        module("namedWithIndirectDependencyViaReflect", listOf(ForTestCompileRuntime.reflectJarForTests()))
+        module("namedWithIndirectDependencyViaReflect", listOf(ForTestCompileRuntime.reflectJarFromDistForTests()))
     }
 
     fun testDependencyOnStdlibJdk78() {
         module("usage", listOf(File("dist/kotlinc/lib/kotlin-stdlib-jdk7.jar"), File("dist/kotlinc/lib/kotlin-stdlib-jdk8.jar")))
     }
 
+    @Suppress("DEPRECATION")
     fun testDependencyOnReflect() {
-        module("usage", listOf(ForTestCompileRuntime.reflectJarForTests()))
+        module("usage", listOf(ForTestCompileRuntime.reflectJarFromDistForTests()))
     }
 
     fun testWithBuildFile() {
@@ -277,8 +280,9 @@ abstract class AbstractJavaModulesIntegrationTest(
         assertEquals("usage/some.module.withsome.packages.Test", stdout)
     }
 
+    @Suppress("DEPRECATION")
     fun testReflection() {
-        val reflect = ForTestCompileRuntime.reflectJarForTests()
+        val reflect = ForTestCompileRuntime.reflectJarFromDistForTests()
         val usage = module("usage", listOf(reflect))
         val (stdout, stderr) = runModule("usage/usage.test.UsageKt", listOf(usage, reflect))
         assertEquals("", stderr)