From d1c40827612e1b309f03ba8ef84cb634fa7a7b9a Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 6 Mar 2021 17:36:12 +0000 Subject: [PATCH] Fix tests on windows --- src/test/groovy/net/fabricmc/loom/AccessWidenerTest.groovy | 2 +- src/test/groovy/net/fabricmc/loom/ReproducibleBuildTest.groovy | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/net/fabricmc/loom/AccessWidenerTest.groovy b/src/test/groovy/net/fabricmc/loom/AccessWidenerTest.groovy index a144900..37e6cf9 100644 --- a/src/test/groovy/net/fabricmc/loom/AccessWidenerTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/AccessWidenerTest.groovy @@ -43,7 +43,7 @@ class AccessWidenerTest extends Specification implements ProjectTestTrait, Archi def result = create("build", gradle) then: result.task(":build").outcome == SUCCESS - getArchiveEntry("fabric-example-mod-1.0.0.jar", "modid.accesswidener") == expected() + getArchiveEntry("fabric-example-mod-1.0.0.jar", "modid.accesswidener") == expected().replaceAll('\r','') where: gradle | _ '6.8.3' | _ diff --git a/src/test/groovy/net/fabricmc/loom/ReproducibleBuildTest.groovy b/src/test/groovy/net/fabricmc/loom/ReproducibleBuildTest.groovy index 3025b03..cb1343b 100644 --- a/src/test/groovy/net/fabricmc/loom/ReproducibleBuildTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/ReproducibleBuildTest.groovy @@ -28,11 +28,13 @@ import com.google.common.hash.HashCode import com.google.common.hash.Hashing import com.google.common.io.Files import net.fabricmc.loom.util.ProjectTestTrait +import spock.lang.IgnoreIf import spock.lang.Specification import spock.lang.Unroll import static org.gradle.testkit.runner.TaskOutcome.SUCCESS +@IgnoreIf({ os.windows }) // Linux and mac create the same files, im unsure why windows is different. Let me know if you have any ideas? class ReproducibleBuildTest extends Specification implements ProjectTestTrait { @Override String name() {