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

2020-09-01 21:00:27 +02:00 · 2020-09-01 21:00:27 +02:00 · 41613c16e9
parent e573fa9abc
commit 41613c16e9
1 changed files with 3 additions and 5 deletions
--- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy
+++ b/buildSrc/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")
    }