commit 10bed94a3a3ee49128c676fc3760f03b9a69ac04
author Søren Gjesse <sgjesse@google.com> Tue Dec 04 13:25:37 2018 +0100
committer Søren Gjesse <sgjesse@google.com> Tue Dec 04 13:25:37 2018 +0100
tree 424c0bfc0d8f184ff94aff1ccdf9c228b6653115
parent 68ed5396cfa804656d8f355cfbfffa7d4b315e5d

Fix test failures on Windows

Bug: 119935815
Change-Id: I3fd1a6c3917b4d2381f90f8e5ca4baaef4e40398

src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java

diff --git a/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java b/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java
index 5fa4cf3..3042cbe 100644
--- a/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java
+++ b/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java
@@ -606,7 +606,7 @@
             output.replace("\r", "").equals(javaResult.stdout.replace("\r", "")));
       }
     } catch (Throwable t) {
-      assert expectedToFail;
+      assert expectedToFail && !ToolHelper.compareAgaintsGoldenFiles();
     }
   }