Disable CI builds for Gradle

graalvm · Feb 4, 2022 · 2dcd531 · 2dcd531
1 parent 1a34e27
commit 2dcd531
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/gradle-windows.yml → ...hub/workflows/gradle-windows.yml.disabled b/.github/workflows/gradle-windows.yml → ...hub/workflows/gradle-windows.yml.disabled
diff --git a/.../testFixtures/groovy/org/graalvm/buildtools/gradle/fixtures/AbstractFunctionalTest.groovy b/.../testFixtures/groovy/org/graalvm/buildtools/gradle/fixtures/AbstractFunctionalTest.groovy
@@ -129,15 +129,15 @@ abstract class AbstractFunctionalTest extends Specification {
     }
 
     void outputContains(String text) {
-        assert output.contains(text)
+        assert output.contains(normalizeString(text))
     }
 
     void outputDoesNotContain(String text) {
-        assert !output.contains(text)
+        assert !output.contains(normalizeString(text))
     }
 
     void errorOutputContains(String text) {
-        assert errorOutput.contains(text)
+        assert errorOutput.contains(normalizeString(text))
     }
 
     void tasks(@DelegatesTo(value = TaskExecutionGraph, strategy = Closure.DELEGATE_FIRST) Closure spec) {
@@ -148,8 +148,8 @@ abstract class AbstractFunctionalTest extends Specification {
     }
 
     private void recordOutputs() {
-        output = outputWriter.toString()
-        errorOutput = errorOutputWriter.toString()
+        output = normalizeString(outputWriter.toString())
+        errorOutput = normalizeString(errorOutputWriter.toString())
     }
 
     private GradleRunner newRunner(String... args) {
@@ -243,4 +243,8 @@ abstract class AbstractFunctionalTest extends Specification {
             }
         }
     }
+
+    private static String normalizeString(String input) {
+        input.replace("\r\n", "\n")
+    }
 }
diff --git a/...estFixtures/groovy/org/graalvm/buildtools/maven/AbstractGraalVMMavenFunctionalTest.groovy b/...estFixtures/groovy/org/graalvm/buildtools/maven/AbstractGraalVMMavenFunctionalTest.groovy
@@ -131,14 +131,18 @@ abstract class AbstractGraalVMMavenFunctionalTest extends Specification {
     }
 
     boolean outputContains(String text) {
-        result.stdOut.contains(text)
+        normalizeString(result.stdOut).contains(normalizeString(text))
     }
 
     boolean outputDoesNotContain(String text) {
-        !result.stdOut.contains(text)
+        !normalizeString(result.stdOut).contains(normalizeString(text))
     }
 
     File file(String path) {
         testDirectory.resolve(path).toFile()
     }
+
+    private static String normalizeString(String input) {
+        input.replace("\r\n", "\n")
+    }
 }