commit 36e3c35893d6f13d7d3fe0c09eef5a2d86311ed0
author Clément Béra <clementbera@google.com> Thu Mar 13 11:14:17 2025 +0100
committer Clément Béra <clementbera@google.com> Thu Mar 13 11:14:17 2025 +0100
tree 98af50f3bee59a8fe33195277fb600d1b3a70c03
parent 66820f2477cbeeb606c41a9b502a87933345fd14

Fix TEST_DATA_LOCATION path to run jdk11 21 tests in intelliJ

Change-Id: I2e767158dd10f6490829cb1685cfc2ed250e006f

d8_r8/test_modules/tests_java_11/build.gradle.kts

diff --git a/d8_r8/test_modules/tests_java_11/build.gradle.kts b/d8_r8/test_modules/tests_java_11/build.gradle.kts
index fb736fd..d14c599 100644
--- a/d8_r8/test_modules/tests_java_11/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_11/build.gradle.kts
@@ -45,10 +45,7 @@
     TestingState.setUpTestingState(this)
     javaLauncher = getJavaLauncher(Jdk.JDK_11)
     systemProperty("TEST_DATA_LOCATION",
-      // This should be
-      //   layout.buildDirectory.dir("classes/java/test").get().toString()
-      // once the use of 'buildExampleJars' above is removed.
-                   getRoot().resolveAll("build", "test", "java11", "classes"))
+                   layout.buildDirectory.dir("classes/java/test").get().toString())
     systemProperty("TESTBASE_DATA_LOCATION",
                    testbaseJavaCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[0])
   }

d8_r8/test_modules/tests_java_21/build.gradle.kts

diff --git a/d8_r8/test_modules/tests_java_21/build.gradle.kts b/d8_r8/test_modules/tests_java_21/build.gradle.kts
index f1467ff..75a1a4e 100644
--- a/d8_r8/test_modules/tests_java_21/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_21/build.gradle.kts
@@ -45,10 +45,7 @@
     TestingState.setUpTestingState(this)
     javaLauncher = getJavaLauncher(Jdk.JDK_21)
     systemProperty("TEST_DATA_LOCATION",
-      // This should be
-      //   layout.buildDirectory.dir("classes/java/test").get().toString()
-      // once the use of 'buildExampleJars' above is removed.
-                   getRoot().resolveAll("build", "test", "java21", "classes"))
+                   layout.buildDirectory.dir("classes/java/test").get().toString())
     systemProperty("TESTBASE_DATA_LOCATION",
                    testbaseJavaCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[0])
   }