commit d9a884515f94108a2c66d61cc111a22ebecab8b8
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Jan 31 14:13:54 2020 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Fri Jan 31 15:19:50 2020 +0000
tree 7a8cb65af53154c92267f67efca3979aa0549ab3
parent 753378dcd0d66fa6ebf8a4451581daf716ed94c5

Set default encoding for windows to be UTF-8

Having default file encoding in windows seems to be the problem:
https://ci.chromium.org/p/r8/builders/ci/windows/1965

Bug: 119097175
Change-Id: I6c19bc12b30f3e97af3b82c678f653908c3a1c1a

build.gradle

diff --git a/build.gradle b/build.gradle
index bce1569..51b7df0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -506,6 +506,8 @@
 // Check if running with the JDK location from tools/jdk.py.
 if (OperatingSystem.current().isWindows()) {
     println "NOTE: Running with JDK: " + org.gradle.internal.jvm.Jvm.current().javaHome
+    compileJava.options.encoding = "UTF-8"
+    compileTestJava.options.encoding = "UTF-8"
 } else {
     def javaHomeOut = new StringBuilder()
     def javaHomeErr = new StringBuilder()

src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java
index c8d3f1c..f19fa6f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java
@@ -10,14 +10,12 @@
 
 import com.android.tools.r8.D8TestRunResult;
 import com.android.tools.r8.ForceInline;
-import com.android.tools.r8.JvmTestRunResult;
 import com.android.tools.r8.NeverInline;
 import com.android.tools.r8.R8TestRunResult;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.TestParametersCollection;
 import com.android.tools.r8.TestRunResult;
-import com.android.tools.r8.ToolHelper;
 import com.android.tools.r8.utils.StringUtils;
 import com.android.tools.r8.utils.codeinspector.ClassSubject;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
@@ -49,11 +47,10 @@
   @Test
   public void testJVMOutput() throws Exception {
     assumeTrue("Only run JVM reference on CF runtimes", parameters.isCfRuntime());
-    JvmTestRunResult run = testForJvm().addTestClasspath().run(parameters.getRuntime(), MAIN);
-    // TODO(b/119097175): Fix test
-    if (!ToolHelper.isWindows()) {
-      run.assertSuccessWithOutput(JAVA_OUTPUT);
-    }
+    testForJvm()
+        .addTestClasspath()
+        .run(parameters.getRuntime(), MAIN)
+        .assertSuccessWithOutput(JAVA_OUTPUT);
   }
 
   private long countNonZeroConstNumber(MethodSubject method) {
@@ -102,12 +99,9 @@
             .enableInliningAnnotations()
             .addKeepMainRule(MAIN)
             .setMinApi(parameters.getApiLevel())
-            .run(parameters.getRuntime(), MAIN);
-    // TODO(b/119097175): Fix test
-    if (!ToolHelper.isWindows()) {
-      result.assertSuccessWithOutput(JAVA_OUTPUT);
-      test(result, 0, parameters.isDexRuntime() ? 6 : 7);
-    }
+            .run(parameters.getRuntime(), MAIN)
+            .assertSuccessWithOutput(JAVA_OUTPUT);
+    test(result, 0, parameters.isDexRuntime() ? 6 : 7);
   }
 
   public static class TestClass {