commit 6fb5d9e5cf2006772d623516c91933224d6dfe26
author Søren Gjesse <sgjesse@google.com> Thu Dec 06 09:30:58 2018 +0100
committer Søren Gjesse <sgjesse@google.com> Thu Dec 06 09:30:58 2018 +0100
tree 8474168fdb4204199c84953386cf2e3fc7bc3bf1
parent 8356a5f7fff5bcce4f70424ca27da6266e33ed6f

Try to fix failures on Windows bot

Also add debug code for for Windows failure if still present.

Bug: 119935815
Change-Id: I54ca6cb8bc0e66904f6dc4f56b4b4d89f5c22d6c

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 3042cbe..75dfc91 100644
--- a/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java
+++ b/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java
@@ -592,7 +592,9 @@
               builder.appendProgramArgument(arg);
             }
           });
-      if (!skipRunningOnJvm(testName) && !ToolHelper.compareAgaintsGoldenFiles()) {
+      if (!expectedToFail
+          && !skipRunningOnJvm(testName)
+          && !ToolHelper.compareAgaintsGoldenFiles()) {
         ArrayList<String> javaArgs = Lists.newArrayList(args);
         javaArgs.add(0, qualifiedMainClass);
         ToolHelper.ProcessResult javaResult =
@@ -606,6 +608,13 @@
             output.replace("\r", "").equals(javaResult.stdout.replace("\r", "")));
       }
     } catch (Throwable t) {
+      if (ToolHelper.isWindows()) {
+        System.out.println("Throwable: " + t.getMessage());
+        t.printStackTrace(System.out);
+        System.out.println("expectedToFail: " + expectedToFail);
+        System.out.println(
+            "ToolHelper.compareAgaintsGoldenFiles(): " + ToolHelper.compareAgaintsGoldenFiles());
+      }
       assert expectedToFail && !ToolHelper.compareAgaintsGoldenFiles();
     }
   }