Use system specific separator to run correctly on windows
Change-Id: I334739b9a94cbd650e8d835c6220ee9a3b1e8da1
diff --git a/src/test/java/com/android/tools/r8/regress/b316744331/Regress316744331Test.java b/src/test/java/com/android/tools/r8/regress/b316744331/Regress316744331Test.java
index bf6229b..e3e6058 100644
--- a/src/test/java/com/android/tools/r8/regress/b316744331/Regress316744331Test.java
+++ b/src/test/java/com/android/tools/r8/regress/b316744331/Regress316744331Test.java
@@ -26,12 +26,12 @@
static final String EXPECTED = StringUtils.lines("No null fields");
- static final int ENTRY_LINE = 22;
- static final int IN_STREAM_CHECK_LINE = 23;
- static final int IN_STREAM_IS_NULL_LINE = 24;
- static final int OUT_STREAM_CHECK_LINE = 29;
- static final int OUT_STREAM_IS_NULL_LINE = 30;
- static final int NORMAL_EXIT_LINE = 33;
+ static final int ENTRY_LINE = 23;
+ static final int IN_STREAM_CHECK_LINE = ENTRY_LINE + 1;
+ static final int IN_STREAM_IS_NULL_LINE = ENTRY_LINE + 2;
+ static final int OUT_STREAM_CHECK_LINE = ENTRY_LINE + 7;
+ static final int OUT_STREAM_IS_NULL_LINE = ENTRY_LINE + 8;
+ static final int NORMAL_EXIT_LINE = ENTRY_LINE + 11;
static final Value NULL_VALUE = Value.createObjectValue(Tag.OBJECT_TAG, 0);
diff --git a/src/test/java/com/android/tools/r8/regress/b316744331/Regress316744331TestClass.java b/src/test/java/com/android/tools/r8/regress/b316744331/Regress316744331TestClass.java
index e7d2583..1a57586 100644
--- a/src/test/java/com/android/tools/r8/regress/b316744331/Regress316744331TestClass.java
+++ b/src/test/java/com/android/tools/r8/regress/b316744331/Regress316744331TestClass.java
@@ -4,6 +4,7 @@
package com.android.tools.r8.regress.b316744331;
+import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.PrintWriter;
@@ -41,7 +42,7 @@
if (jarIndex < 0) {
jarIndex = cp.indexOf(".zip");
}
- int start = cp.lastIndexOf(':', jarIndex);
+ int start = cp.lastIndexOf(File.pathSeparatorChar, jarIndex);
String filename = cp.substring(Math.max(start, 0), jarIndex + 4);
new Regress316744331TestClass(filename).foo();
}
