Attempt to fix ProxiesTest/CF on Windows, CRLF comparison issue.
Change-Id: I916c2af3c45fc28ae46fa121ccc63c2016c91252
diff --git a/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java b/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java
index b22dc1e..b3e6367 100644
--- a/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java
@@ -79,9 +79,11 @@
}
AndroidApp app = ToolHelper.runR8(builder.build(), o -> o.enableDevirtualization = false);
inspection.accept(new CodeInspector(app, o -> o.enableCfFrontend = true));
- assertEquals(
- expectedResult,
- backend == Backend.DEX ? runOnArt(app, mainClass) : runOnJava(app, mainClass));
+ String result = backend == Backend.DEX ? runOnArt(app, mainClass) : runOnJava(app, mainClass);
+ if (ToolHelper.isWindows()) {
+ result = result.replace(System.lineSeparator(), "\n");
+ }
+ assertEquals(expectedResult, result);
}
private int countInstructionInX(CodeInspector inspector, Predicate<InstructionSubject> invoke) {
