| commit | c21b10c73aaf92786fe7b70a022b034b442e2422 | [log] [tgz] |
|---|---|---|
| author | Morten Krogh-Jespersen <mkroghj@google.com> | Thu Sep 02 08:29:34 2021 +0200 |
| committer | Morten Krogh-Jespersen <mkroghj@google.com> | Thu Sep 02 08:29:34 2021 +0200 |
| tree | 0e195b9c7a4534f29402693c453dd8f8464689f8 | |
| parent | 1415ee3e67c0f06f9c87c9070542a2668be901dd [diff] |
Run RetraceBinaryCompatibilityTests on windows Bug: 198416916 Change-Id: I1411d4129bff6b4ce0d54f97cbdb70d9ad65cf52
diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiBinaryCompatibilityTest.java b/src/test/java/com/android/tools/r8/retrace/api/RetraceApiBinaryCompatibilityTest.java index dbfc2cc..2c52863 100644 --- a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiBinaryCompatibilityTest.java +++ b/src/test/java/com/android/tools/r8/retrace/api/RetraceApiBinaryCompatibilityTest.java
@@ -76,7 +76,6 @@ @Test public void runCheckedInBinaryJar() throws Exception { - Assume.assumeFalse(ToolHelper.isWindows()); for (CfRuntime cfRuntime : CfRuntime.getCheckedInCfRuntimes()) { RetraceApiTestHelper.runJunitOnTests( cfRuntime,
diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestHelper.java b/src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestHelper.java index 9b2f67d..a1049f1 100644 --- a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestHelper.java +++ b/src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestHelper.java
@@ -69,7 +69,7 @@ private static Path getJunitDependency() { String junitPath = - Arrays.stream(System.getProperty("java.class.path").split(":")) + Arrays.stream(System.getProperty("java.class.path").split(File.pathSeparator)) .filter(cp -> cp.endsWith(JUNIT_JAR)) .collect(Collectors.toSingle()); return Paths.get(junitPath); @@ -77,7 +77,7 @@ private static Path getHamcrest() { String junitPath = - Arrays.stream(System.getProperty("java.class.path").split(":")) + Arrays.stream(System.getProperty("java.class.path").split(File.pathSeparator)) .filter(cp -> cp.endsWith(HAMCREST)) .collect(Collectors.toSingle()); return Paths.get(junitPath);