Adjust tests to run on Windows.

graalvm · Oct 18, 2023 · e7069a1 · e7069a1
1 parent c7c5cb0
commit e7069a1
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 10 deletions.
diff --git a/.../functionalTest/groovy/org/graalvm/buildtools/gradle/JavaApplicationFunctionalTest.groovy b/.../functionalTest/groovy/org/graalvm/buildtools/gradle/JavaApplicationFunctionalTest.groovy
@@ -227,8 +227,13 @@ class JavaApplicationFunctionalTest extends AbstractFunctionalTest {
         given:
         withSample("java-application")
         buildFile << """
-            graalvmNative.binaries.all {
-                verbose = true
+            graalvmNative {
+                useArgFile = false // required to check for --pgo flag
+                binaries {
+                    all {
+                        verbose = true
+                    }
+                }
             }
         """
 

diff --git a/...functionalTest/groovy/org/graalvm/buildtools/gradle/NativeConfigRepoFunctionalTest.groovy b/...functionalTest/groovy/org/graalvm/buildtools/gradle/NativeConfigRepoFunctionalTest.groovy
@@ -78,7 +78,7 @@ class NativeConfigRepoFunctionalTest extends AbstractFunctionalTest {
         outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
 
         and: "but finds one thanks to the latest configuration field"
-        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal/library-with-reflection/1"
+        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal" + File.separator + "library-with-reflection" + File.separator + "1"
 
         where:
         format   | label

diff --git a/...tionalTest/groovy/org/graalvm/buildtools/gradle/OfficialMetadataRepoFunctionalTest.groovy b/...tionalTest/groovy/org/graalvm/buildtools/gradle/OfficialMetadataRepoFunctionalTest.groovy
@@ -60,7 +60,7 @@ class OfficialMetadataRepoFunctionalTest extends AbstractFunctionalTest {
         }
 
         and: "finds metadata in the remote repository"
-        outputContains "[graalvm reachability metadata repository for com.h2database:h2:2.1.210]: Configuration directory is com.h2database/h2/2.1.210"
+        outputContains "[graalvm reachability metadata repository for com.h2database:h2:2.1.210]: Configuration directory is com.h2database" + File.separator + "h2" + File.separator + "2.1.210"
         outputDoesNotContain "Falling back to the default repository at"
     }
 

diff --git a/...c/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationFunctionalTest.groovy b/...c/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationFunctionalTest.groovy
@@ -43,6 +43,8 @@ package org.graalvm.buildtools.maven
 
 import spock.lang.Issue
 
+import static org.graalvm.buildtools.utils.SharedConstants.NATIVE_IMAGE_EXE;
+
 class JavaApplicationFunctionalTest extends AbstractGraalVMMavenFunctionalTest {
     def "proper options are added to the native-image invocation"() {
         withSample("java-application")
@@ -55,7 +57,9 @@ class JavaApplicationFunctionalTest extends AbstractGraalVMMavenFunctionalTest {
 
         then:
         buildSucceeded
-        outputContains "native-image -cp / -g --no-fallback --verbose --shared -Ob"
+        outputContains NATIVE_IMAGE_EXE
+        outputContains "-cp " // actual path is OS-specific (/ vs C:\)
+        outputContains "-g --no-fallback --verbose --shared -Ob"
     }
 
     def "can build and execute a native image with the Maven plugin"() {
@@ -116,7 +120,7 @@ class JavaApplicationFunctionalTest extends AbstractGraalVMMavenFunctionalTest {
 
         then:
         buildSucceeded
-        outputContains "Args file written to: target/native-image"
+        outputContains "Args file written to: target" + File.separator + "native-image"
     }
 
 }
diff --git a/...unctionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy b/...unctionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy
@@ -41,6 +41,8 @@
 
 package org.graalvm.buildtools.maven
 
+import static org.graalvm.buildtools.utils.SharedConstants.NATIVE_IMAGE_EXE;
+
 class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTest {
 
     void "if metadata is disabled, reflection fails"() {
@@ -70,7 +72,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
         outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
 
         and: "but it finds one thanks to the latest configuration field"
-        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal/library-with-reflection/1"
+        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal" + File.separator + "library-with-reflection" + File.separator + "1"
     }
 
     void "if excludeConfig is set it is added to the command line invocation"() {
@@ -82,7 +84,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
 
         then:
         buildSucceeded
-        outputContains "native-image --exclude-config dummy/path/to/file.jar \"*\""
+        outputContains NATIVE_IMAGE_EXE + " --exclude-config dummy/path/to/file.jar \"*\""
    }
 
     void "if the path doesn't exist it throws an error"() {
@@ -138,7 +140,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
         outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
 
         and: "but it finds one thanks to the latest configuration field"
-        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal/library-with-reflection/1"
+        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal" + File.separator + "library-with-reflection" + File.separator + "1"
     }
 
     void "it can download a remote repository"() {
@@ -158,7 +160,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
         outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
 
         and: "but it finds one thanks to the latest configuration field"
-        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal/library-with-reflection/1"
+        outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal" + File.separator + "library-with-reflection" + File.separator + "1"
     }
 
     void "when pointing to a missing URL, reflection fails"() {

diff --git a/samples/java-library/build.gradle b/samples/java-library/build.gradle
@@ -57,6 +57,7 @@ dependencies {
 }
 
 graalvmNative {
+    useArgFile = false // required to check for flags in tests
     binaries {
         main {
             verbose = true

diff --git a/samples/java-library/pom.xml b/samples/java-library/pom.xml
@@ -89,6 +89,7 @@
                             <imageName>${imageName}</imageName>
                             <fallback>false</fallback>
                             <sharedLibrary>true</sharedLibrary>
+                            <useArgFile>false</useArgFile>
                         </configuration>
                     </plugin>
                 </plugins>

diff --git a/samples/native-config-integration/pom.xml b/samples/native-config-integration/pom.xml
@@ -94,6 +94,7 @@
                             <imageName>${imageName}</imageName>
                             <fallback>false</fallback>
                             <quickBuild>true</quickBuild>
+                            <useArgFile>false</useArgFile>
                         </configuration>
                     </plugin>
                 </plugins>