Cleanup

Author: dnestoro

common/utils/src/main/java/org/graalvm/buildtools/utils/SharedConstants.java

@@ -78,6 +78,7 @@ public interface SharedConstants {
     String AGENT_OUTPUT_DIRECTORY_MARKER = "{output_dir}";
     String AGENT_OUTPUT_DIRECTORY_OPTION = "config-output-dir=";
     String METADATA_REPO_URL_TEMPLATE = "https://github.com/oracle/graalvm-reachability-metadata/releases/download/%1$s/graalvm-reachability-metadata-%1$s.zip";
+    String SKIP_JVM_TESTS = "skipJVMTests";
     /**
      * The default metadata repository version. Maintained for backwards
      * compatibility.

gradle/libs.versions.toml

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

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/JavaApplicationWithAgentFunctionalTest.groovy

@@ -74,7 +74,7 @@ class JavaApplicationWithAgentFunctionalTest extends AbstractFunctionalTest {
         withSample("java-application-with-reflection")
 
         when:
-        fails 'nativeTest', '-DskipJVMTests=true'
+        fails 'nativeTest'
 
         then:
         outputContains "expected: <Hello, native!> but was: <null>"

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/JavaApplicationWithResourcesFunctionalTest.groovy

@@ -144,7 +144,7 @@ graalvmNative {
         buildFile << config
 
         when:
-        run 'nativeTest', '-DskipJVMTests=true'
+        run 'nativeTest'
 
         then:
         tasks {

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/JavaApplicationWithTestsFunctionalTest.groovy

@@ -97,7 +97,7 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractFunctionalTest {
         withSample("java-application-with-tests")
 
         when:
-        run 'nativeTest', '-DskipJVMTests=true'
+        run 'nativeTest'
 
         then:
         tasks {
@@ -156,7 +156,7 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractFunctionalTest {
         """
 
         when:
-        run 'nativeTest', '-DskipJVMTests=true'
+        run 'nativeTest'
 
         then:
         tasks {
@@ -188,7 +188,7 @@ class JavaApplicationWithTestsFunctionalTest extends AbstractFunctionalTest {
         """
 
         when:
-        run 'nativeTest', '-DskipJVMTests=true'
+        run 'nativeTest'
 
         then:
         tasks {

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/KotlinApplicationWithTestsFunctionalTest.groovy

@@ -53,7 +53,7 @@ class KotlinApplicationWithTestsFunctionalTest extends AbstractFunctionalTest {
         withSample("kotlin-application-with-tests")
 
         when:
-        run 'nativeTest', '-DskipJVMTests=true'
+        run 'nativeTest'
 
         then:
         tasks {

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/MultiProjectJavaApplicationWithTestsFunctionalTest.groovy

@@ -51,7 +51,7 @@ class MultiProjectJavaApplicationWithTestsFunctionalTest extends AbstractFunctio
         withSample("multi-project-with-tests", false)
 
         when:
-        run 'nativeTest', '-DskipJVMTests=true'
+        run 'nativeTest'
 
         then:
         tasks {

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

@@ -682,7 +682,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()) {
                 if (graalExtension.getAgent().getEnabled().get()) {
                     throw new IllegalStateException("Native Image Agent and skipJVMTests cannot be used at the same time.");
                 }
@@ -724,13 +724,8 @@ public void registerTestBinary(Project project,
         });
     }
 
-    private boolean shouldSkipJVMTests(boolean valueFromBuildFile) {
-        String valueFromCommandLine = System.getProperty("skipJVMTests");
-        if (valueFromCommandLine == null) {
-            return valueFromBuildFile;
-        }
-
-        return Boolean.parseBoolean(valueFromCommandLine);
+    private boolean shouldSkipJVMTests() {
+        return Boolean.parseBoolean(System.getProperty(SharedConstants.SKIP_JVM_TESTS));
     }
 
     /**

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

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