Add flag for skipping tests on JVM in Gradle plugin

Author: dnestoro

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # Project versions
-nativeBuildTools = "0.11.1-SNAPSHOT"
+nativeBuildTools = "0.11.1-DRY"
 metadataRepository = "0.3.22"
 
 # External dependencies

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

@@ -680,7 +680,16 @@ public void registerTestBinary(Project project,
             test.getOutputs().dir(testList);
             // Set system property read by the UniqueIdTrackingListener.
             test.systemProperty(JUNIT_PLATFORM_LISTENERS_UID_TRACKING_ENABLED, true);
-            test.systemProperty(JUNIT_PLATFORM_DRY_RUN_ENABLED, true);
+
+            // Set system property to skip execution of JVM tests before native tests
+            if (shouldSkipJVMTests(testOptions.getSkipJVMTests().get())) {
+                if (graalExtension.getAgent().getEnabled().get()) {
+                    throw new IllegalStateException("Native Image Agent and skipJVMTests cannot be used at the same time.");
+                }
+
+                test.systemProperty(JUNIT_PLATFORM_DRY_RUN_ENABLED, true);
+            }
+
             TrackingDirectorySystemPropertyProvider directoryProvider = project.getObjects().newInstance(TrackingDirectorySystemPropertyProvider.class);
             directoryProvider.getDirectory().set(testListDirectory);
             test.getJvmArgumentProviders().add(directoryProvider);
@@ -715,6 +724,15 @@ public void registerTestBinary(Project project,
         });
     }
 
+    private boolean shouldSkipJVMTests(boolean valueFromBuildFile) {
+        String valueFromCommandLine = System.getProperty("skipJVMTests");
+        if (valueFromCommandLine == null) {
+            return valueFromBuildFile;
+        }
+
+        return Boolean.parseBoolean(valueFromCommandLine);
+    }
+
     /**
      * Returns a provider which prefers the CLI arguments over the configured
      * extension value.

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

@@ -229,6 +229,14 @@ public interface NativeImageCompileOptions {
     @Nested
     DeprecatedAgentOptions getAgent();
 
+    /**
+     * Gets value which determines if JVM tests run should be skipped.
+     *
+     * @return true if JVM tests should be skipped
+     */
+    @Input
+    Property<Boolean> getSkipJVMTests();
+
     /**
      * When set to true, the compiled binaries will be generated with PGO instrumentation
      * support.

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

@@ -276,6 +276,7 @@ public BaseNativeImageOptions(String name,
         getSharedLibrary().convention(false);
         getImageName().convention(defaultImageName);
         getUseFatJar().convention(false);
+        getSkipJVMTests().convention(false);
         getPgoInstrument().convention(false);
         DirectoryProperty pgoProfileDir = objectFactory.directoryProperty();
         pgoProfileDir.convention(layout.getProjectDirectory().dir("src/pgo-profiles/" + name));

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

@@ -166,6 +166,11 @@ public DeprecatedAgentOptions getAgent() {
         return options.getAgent();
     }
 
+    @Override
+    public Property<Boolean> getSkipJVMTests() {
+        return options.getSkipJVMTests();
+    }
+
     @Override
     public Property<Boolean> getPgoInstrument() {
         return options.getPgoInstrument();