diff --git a/.github/workflows/gradle-windows.yml b/.github/workflows/gradle-windows.yml.disabled similarity index 100% rename from .github/workflows/gradle-windows.yml rename to .github/workflows/gradle-windows.yml.disabled diff --git a/.github/workflows/maven-windows.yml b/.github/workflows/maven-windows.yml.disabled similarity index 100% rename from .github/workflows/maven-windows.yml rename to .github/workflows/maven-windows.yml.disabled diff --git a/native-gradle-plugin/src/testFixtures/groovy/org/graalvm/buildtools/gradle/fixtures/AbstractFunctionalTest.groovy b/native-gradle-plugin/src/testFixtures/groovy/org/graalvm/buildtools/gradle/fixtures/AbstractFunctionalTest.groovy index 1c029d638..2df145387 100644 --- a/native-gradle-plugin/src/testFixtures/groovy/org/graalvm/buildtools/gradle/fixtures/AbstractFunctionalTest.groovy +++ b/native-gradle-plugin/src/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/native-maven-plugin/src/testFixtures/groovy/org/graalvm/buildtools/maven/AbstractGraalVMMavenFunctionalTest.groovy b/native-maven-plugin/src/testFixtures/groovy/org/graalvm/buildtools/maven/AbstractGraalVMMavenFunctionalTest.groovy index 45fe7d941..99eb80d1b 100644 --- a/native-maven-plugin/src/testFixtures/groovy/org/graalvm/buildtools/maven/AbstractGraalVMMavenFunctionalTest.groovy +++ b/native-maven-plugin/src/testFixtures/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") + } }