Rework output normalization in build-tools func tests (#61706) (#61721)

yeohbraddy · Sep 1, 2020 · 41613c1 · 41613c1
1 parent e573fa9
commit 41613c1
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/...dSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy b/...dSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy
@@ -57,12 +57,10 @@ abstract class AbstractGradleFuncTest extends Specification {
     }
 
     String normalizedOutput(String input) {
+        String normalizedPathPrefix = testProjectDir.root.canonicalPath.replace('\\', '/')
         return input.readLines()
-                .collect { it.replaceAll("\\\\", "/") }
-                .collect {
-                    it.replaceAll(
-                            testProjectDir.root.canonicalPath.replaceAll('\\\\', '/'), ".")
-                }
+                .collect { it.replace('\\', '/') }
+                .collect {it.replace(normalizedPathPrefix , '.') }
                 .join("\n")
     }