commit 4c9898a4c47285304397ab5b8e39732e6934a2f4
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Dec 05 08:48:00 2019 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Dec 05 07:57:43 2019 +0000
tree d596291b01d42c767debae63069f261dbd117d09
parent 7e0ef8502592e763dba7f7fdbbee0390df12c8cb

Target jdk9 for kotlin tests to support windows

Change-Id: Ibe915d17bb3bf2965245eb6bb6888dd0a8c3aadb

src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
index cba0f8b..f679f94 100644
--- a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
+++ b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
@@ -44,7 +44,12 @@
   public void testRuntime() throws ExecutionException, CompilationFailedException, IOException {
     testForRuntime(parameters)
         .addProgramFiles(
-            kotlinc(TestRuntime.getCheckedInJdk8(), KOTLINC, KotlinTargetVersion.JAVA_8)
+            kotlinc(
+                    parameters.isCfRuntime()
+                        ? parameters.getRuntime().asCf()
+                        : TestRuntime.getCheckedInJdk9(),
+                    KOTLINC,
+                    KotlinTargetVersion.JAVA_8)
                 .addSourceFiles(
                     getFilesInTestFolderRelativeToClass(
                         KotlinInlineFunctionRetraceTest.class, "kt", ".kt"))
@@ -62,7 +67,12 @@
     R8TestRunResult result =
         testForR8(parameters.getBackend())
             .addProgramFiles(
-                kotlinc(TestRuntime.getCheckedInJdk8(), KOTLINC, KotlinTargetVersion.JAVA_8)
+                kotlinc(
+                        parameters.isCfRuntime()
+                            ? parameters.getRuntime().asCf()
+                            : TestRuntime.getCheckedInJdk9(),
+                        KOTLINC,
+                        KotlinTargetVersion.JAVA_8)
                     .addSourceFiles(
                         getFilesInTestFolderRelativeToClass(
                             KotlinInlineFunctionRetraceTest.class, "kt", ".kt"))
@@ -87,7 +97,12 @@
     R8TestRunResult result =
         testForR8(parameters.getBackend())
             .addProgramFiles(
-                kotlinc(TestRuntime.getCheckedInJdk8(), KOTLINC, KotlinTargetVersion.JAVA_8)
+                kotlinc(
+                        parameters.isCfRuntime()
+                            ? parameters.getRuntime().asCf()
+                            : TestRuntime.getCheckedInJdk9(),
+                        KOTLINC,
+                        KotlinTargetVersion.JAVA_8)
                     .addSourceFiles(
                         getFilesInTestFolderRelativeToClass(
                             KotlinInlineFunctionRetraceTest.class, "kt", ".kt"))
@@ -116,7 +131,12 @@
     R8TestRunResult result =
         testForR8(parameters.getBackend())
             .addProgramFiles(
-                kotlinc(TestRuntime.getCheckedInJdk8(), KOTLINC, KotlinTargetVersion.JAVA_8)
+                kotlinc(
+                        parameters.isCfRuntime()
+                            ? parameters.getRuntime().asCf()
+                            : TestRuntime.getCheckedInJdk9(),
+                        KOTLINC,
+                        KotlinTargetVersion.JAVA_8)
                     .addSourceFiles(
                         getFilesInTestFolderRelativeToClass(
                             KotlinInlineFunctionRetraceTest.class, "kt", ".kt"))