Skip JVM tests by default when using nativeTest

Author: dnestoro

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

@@ -136,6 +136,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
@@ -682,7 +683,7 @@ public void registerTestBinary(Project project,
             test.systemProperty(JUNIT_PLATFORM_LISTENERS_UID_TRACKING_ENABLED, true);
 
             // Set system property to skip execution of JVM tests before native tests
-            if (shouldSkipJVMTests(testOptions.getSkipJVMTests().get())) {
+            if (shouldSkipJVMTests(project, testOptions.getSkipJVMTests())) {
                 if (graalExtension.getAgent().getEnabled().get()) {
                     throw new IllegalStateException("Native Image Agent and skipJVMTests cannot be used at the same time.");
                 }
@@ -724,13 +725,44 @@ public void registerTestBinary(Project project,
         });
     }
 
-    private boolean shouldSkipJVMTests(boolean valueFromBuildFile) {
+    private boolean isNativeTestTask(Project project) {
+        List<String> userCalledTasks = project.getGradle().getStartParameter().getTaskNames();
+        for (var task : userCalledTasks) {
+            if (task.contains("native") && task.contains("Test")) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+    private boolean shouldSkipJVMTests(Project project, Property<Boolean> valueFromBuildFile) {
         String valueFromCommandLine = System.getProperty("skipJVMTests");
-        if (valueFromCommandLine == null) {
-            return valueFromBuildFile;
+        if (valueFromCommandLine != null) {
+            // value explicitly set through system property (command line)
+            boolean val = Boolean.parseBoolean(valueFromCommandLine);
+            logger.log("Skipping JVM tests execution explicitly set to " + val + " using system property");
+
+            return val;
+        }
+
+        if (valueFromBuildFile.isPresent()) {
+            // value explicitly set through build file
+            boolean val = valueFromBuildFile.get();
+            logger.log("Skipping JVM tests execution explicitly set to " + val + " using build file");
+
+            return val;
+        }
+
+        List<String> userCalledTasks = project.getGradle().getStartParameter().getTaskNames();
+        for (String task : userCalledTasks) {
+            if (task.contains("native") && task.contains("Test")) {
+                logger.log("Task " + task + " sets skipping JVM tests execution to true");
+
+                return true;
+            }
         }
 
-        return Boolean.parseBoolean(valueFromCommandLine);
+        return false;
     }
 
     /**

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

@@ -234,6 +234,7 @@ public interface NativeImageCompileOptions {
      *
      * @return true if JVM tests should be skipped
      */
+    @Optional
     @Input
     Property<Boolean> getSkipJVMTests();
 

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

@@ -276,7 +276,6 @@ 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));