commit 896cd5dcb42b28d74dca9b02d42a2092790eab11
author Mads Ager <ager@google.com> Tue Jul 24 13:10:54 2018 +0200
committer Mads Ager <ager@google.com> Tue Jul 24 13:10:54 2018 +0200
tree 2f3ec12e1f90142611745173390ade068e383586
parent 98672640ba677dae30bdecfd2d035064dafb74f6

Version 1.2.35.

Merge in the fix for the new tests on Windows added as part of
1.2.34.

R=christofferqa@google.com

Merge: Fix tests on Windows.
CL: https://r8-review.googlesource.com/c/r8/+/23925
Change-Id: I007df4012c0c4f64cdce4eb2e3c4246b1b94e1d3

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 2629bf7..4bb9fb2 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "1.2.34";
+  public static final String LABEL = "1.2.35";
 
   private Version() {
   }

src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java

diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
index c118bad..6574e7b 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
@@ -179,17 +179,17 @@
     // Assertion is hit.
     result = ToolHelper.runJava(buildTestToCf(options -> {}), "-ea", main, "0");
     assertEquals(1, result.exitCode);
-    assertEquals("1\n", result.stdout);
+    assertEquals("1\n".replace("\n", System.lineSeparator()), result.stdout);
     // Assertion is not hit.
     result = ToolHelper.runJava(buildTestToCf(options -> {}), "-ea", main, "1");
     assertEquals(0, result.exitCode);
-    assertEquals("1\n2\n", result.stdout);
+    assertEquals("1\n2\n".replace("\n", System.lineSeparator()), result.stdout);
     // Assertion is hit, but removed.
     result = ToolHelper.runJava(
         buildTestToCf(
             options -> options.disableAssertions = true), "-ea", main, "0");
     assertEquals(0, result.exitCode);
-    assertEquals("1\n2\n", result.stdout);
+    assertEquals("1\n2\n".replace("\n", System.lineSeparator()), result.stdout);
   }
 
   private byte[] identity(byte[] classBytes) {
@@ -225,8 +225,10 @@
     // Assertions not removed when default assertion code is not present.
     app = runRegress110887293(this::chromiumAssertionEnabler);
     assertEquals(
-        "1\nGot AssertionError java.lang.AssertionError\n2\n",
+        "1\nGot AssertionError java.lang.AssertionError\n2\n".replace("\n", System.lineSeparator()),
         runOnArt(app, ClassWithAssertions.class.getCanonicalName(), "0"));
-    assertEquals("1\n2\n", runOnArt(app, ClassWithAssertions.class.getCanonicalName(), "1"));
+    assertEquals(
+        "1\n2\n".replace("\n", System.lineSeparator()),
+        runOnArt(app, ClassWithAssertions.class.getCanonicalName(), "1"));
   }
 }