tck-build-logic: make test directory resolution robust; fallback to conventional layout and metadata-version; tolerate missing tests index.json in TestInvocationTask

Author: vjovanov

tests/tck-build-logic/src/main/groovy/org/graalvm/internal/tck/harness/TckExtension.java

@@ -100,16 +100,38 @@ public Path getTestDir(String coordinates) {
         Objects.requireNonNull(artifactId, "Artifact ID must be specified");
         Objects.requireNonNull(version, "Version must be specified");
 
-        // First, let's try if we can find test directory from the new `tests/src/index.json` file.
-        List<Map<String, ?>> index = (List<Map<String, ?>>) readIndexFile(testRoot());
-        for (Map<String, ?> entry : index) {
-            boolean found = ((List<Map<String, ?>>) entry.get("libraries")).stream().anyMatch(
-                    lib -> coordinatesMatch((String) lib.get("name"), groupId, artifactId) &&
-                            ((List<String>) lib.get("versions")).contains(version)
-            );
-            if (found) {
-                return testRoot().resolve((String) entry.get("test-project-path"));
+        // First, try to locate the test project via the aggregated tests/src/index.json (new layout).
+        try {
+            List<Map<String, ?>> index = (List<Map<String, ?>>) readIndexFile(testRoot());
+            for (Map<String, ?> entry : index) {
+                boolean found = ((List<Map<String, ?>>) entry.get("libraries")).stream().anyMatch(
+                        lib -> coordinatesMatch((String) lib.get("name"), groupId, artifactId) &&
+                                ((List<String>) lib.get("versions")).contains(version)
+                );
+                if (found) {
+                    return testRoot().resolve((String) entry.get("test-project-path"));
+                }
+            }
+        } catch (Exception ignored) {
+            // Fall through to conventional layout resolution below.
+        }
+        // Fallback: conventional layout tests/src/<group>/<artifact>/<version>
+        Path conventional = testRoot().resolve(groupId).resolve(artifactId).resolve(version);
+        if (Files.isDirectory(conventional)) {
+            return conventional;
+        }
+        // Secondary fallback: derive test dir from metadata "metadata-version"
+        try {
+            Path mdDir = getMetadataDir(coordinates); // .../metadata/<group>/<artifact>/<metadata-version>
+            Path mdVersion = mdDir.getFileName();
+            if (mdVersion != null) {
+                Path testsForMetadataVersion = testRoot().resolve(groupId).resolve(artifactId).resolve(mdVersion.toString());
+                if (Files.isDirectory(testsForMetadataVersion)) {
+                    return testsForMetadataVersion;
+                }
             }
+        } catch (Exception ignored) {
+            // ignore and fall through to error
         }
         throw new RuntimeException("Missing test-directory for coordinates `" + coordinates + "`");
     }

tests/tck-build-logic/src/main/groovy/org/graalvm/internal/tck/harness/tasks/TestInvocationTask.java

@@ -51,7 +51,7 @@ public List<String> commandFor(String coordinates) {
             return testIndex.get("test-command").stream()
                     .map(c -> processCommand(c, metadataDir, coordinates))
                     .collect(Collectors.toList());
-        } catch (RuntimeException ignored) {
+        } catch (Exception ignored) {
             return defaultArgs;
         }
     }

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/MetadataFilesCheckerTask.java

@@ -48,7 +48,7 @@ public abstract class MetadataFilesCheckerTask extends DefaultTask {
     List<String> allowedPackages;
 
     @Option(option = "coordinates", description = "Coordinates in the form of group:artifact:version")
-    void setCoordinates(String coords) {
+    public void setCoordinates(String coords) {
         extractCoordinates(coords);
     }
 
@@ -78,11 +78,7 @@ private void extractCoordinates(String c) {
     }
 
     @TaskAction
-    void run() throws IllegalArgumentException, FileNotFoundException {
-        if (coordinates.group().equalsIgnoreCase("org.example") || coordinates.group().equalsIgnoreCase("samples")) {
-            return;
-        }
-
+    public void run() throws IllegalArgumentException, FileNotFoundException {
         File coordinatesMetadataRoot = getMetadataRoot().get().getAsFile();
         if (!coordinatesMetadataRoot.exists()) {
             throw new IllegalArgumentException("ERROR: Cannot find metadata directory for given coordinates: " + this.coordinates);