Pass test-ids from test configuration

Author: dnestoro

common/graalvm-reachability-metadata/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

common/junit-platform-native/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/NativeImageJUnitLauncher.java

@@ -193,7 +193,8 @@ private static Stream<Path> findFiles(Path dir, String prefix) throws IOExceptio
     }
 
     private static Path getTestIDsFromDefaultLocations() {
-        System.out.println("[junit-platform-native] WARNING: Trying to find test-ids on default locations.");
+        System.out.println("[junit-platform-native] WARNING: Trying to find test-ids on default locations. " +
+                "This should only happen if you are running tests executable manually.");
         Path defaultGradleTestIDsLocation = getGradleTestIdsDefaultLocation();
         Path defaultMavenTestIDsLocation = getMavenTestIDsDefaultLocation();
 

native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java

@@ -651,7 +651,6 @@ public void registerTestBinary(Project project,
 
         // Following ensures that required feature jar is on classpath for every project
         injectTestPluginDependencies(project, graalExtension.getTestSupport());
-
         TaskProvider<BuildNativeImageTask> testImageBuilder = tasks.named(deriveTaskName(name, "native", "Compile"), BuildNativeImageTask.class, task -> {
             task.setOnlyIf(t -> graalExtension.getTestSupport().get() && testListDirectory.getAsFile().get().exists());
             task.getTestListDirectory().set(testListDirectory);
@@ -663,6 +662,7 @@ public void registerTestBinary(Project project,
             // Later this will be replaced by a dedicated task not requiring execution of tests
             testList.from(testListDirectory).builtBy(testTask);
             testOptions.getClasspath().from(testList);
+            testOptions.getRuntimeArgs().add("-D" + JUNIT_PLATFORM_LISTENERS_UID_TRACKING_OUTPUT_DIR + "=" + testResultsDir.dir(testTask.getName() + "/testlist").get().getAsFile().getAbsolutePath());
         });
         if (isPrimaryTest) {
             tasks.register(DEPRECATED_NATIVE_TEST_BUILD_TASK, t -> {
@@ -770,16 +770,6 @@ private static NativeImageOptions createTestOptions(GraalVMExtension graalExtens
         runtimeArgs.add("--xml-output-dir");
         runtimeArgs.add(project.getLayout().getBuildDirectory().dir("test-results/" + binaryName + "-native").map(d -> d.getAsFile().getAbsolutePath()));
 
-        String testIds;
-        String propertyBasedLocation = System.getProperty(UniqueIdTrackingListener.OUTPUT_DIR_PROPERTY_NAME);
-        if (propertyBasedLocation != null) {
-            testIds = Path.of(propertyBasedLocation).toAbsolutePath().toString();
-        } else {
-            testIds = project.getLayout().getBuildDirectory().dir("test-results/" + binaryName + "/testlist").map(d -> d.getAsFile().getAbsolutePath()).get();
-        }
-
-        runtimeArgs.add("-Djunit.platform.listeners.uid.tracking.output.dir=" + testIds);
-
         testExtension.buildArgs("--features=org.graalvm.junit.platform.JUnitPlatformFeature");
         ConfigurableFileCollection classpath = testExtension.getClasspath();
         classpath.from(configs.getImageClasspathConfiguration());

native-maven-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists