summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-10-20 14:35:56 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-10-20 14:35:56 -0700
commit98cee68a7026a3ca819cfecacc0c59c943000943 (patch)
treee19a378709ed4fdd74014130e1a545f2065bafa8
parent235f5ccc095da65acbedfdd472be1db099d35ba3 (diff)
parent59b94ef698bc8b1800309d86c5cd2d046acae8ec (diff)
downloadscala-98cee68a7026a3ca819cfecacc0c59c943000943.tar.gz
scala-98cee68a7026a3ca819cfecacc0c59c943000943.tar.bz2
scala-98cee68a7026a3ca819cfecacc0c59c943000943.zip
Merge pull request #3064 from retronym/topic/broken-windows2
Platform independence for test case
-rw-r--r--test/files/run/t6240a/StepOne.java4
-rw-r--r--test/files/run/t6240b/StepOne.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/test/files/run/t6240a/StepOne.java b/test/files/run/t6240a/StepOne.java
index 7abd148d69..342d617c79 100644
--- a/test/files/run/t6240a/StepOne.java
+++ b/test/files/run/t6240a/StepOne.java
@@ -12,7 +12,7 @@ import java.net.MalformedURLException;
public class StepOne {
public static void main(String[] args)
throws MalformedURLException, ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, IOException {
- String[] launchPaths = System.getProperty("launch.classpath").split(":");
+ String[] launchPaths = System.getProperty("launch.classpath").split(File.pathSeparator);
// move away StepThree
File tempDir = File.createTempFile("temp", Long.toString(System.nanoTime()));
@@ -38,4 +38,4 @@ public class StepOne {
Method main = stepTwo.getDeclaredMethod("main", String[].class);
main.invoke(null, (Object)(new String[]{}));
}
-} \ No newline at end of file
+}
diff --git a/test/files/run/t6240b/StepOne.java b/test/files/run/t6240b/StepOne.java
index 7abd148d69..342d617c79 100644
--- a/test/files/run/t6240b/StepOne.java
+++ b/test/files/run/t6240b/StepOne.java
@@ -12,7 +12,7 @@ import java.net.MalformedURLException;
public class StepOne {
public static void main(String[] args)
throws MalformedURLException, ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, IOException {
- String[] launchPaths = System.getProperty("launch.classpath").split(":");
+ String[] launchPaths = System.getProperty("launch.classpath").split(File.pathSeparator);
// move away StepThree
File tempDir = File.createTempFile("temp", Long.toString(System.nanoTime()));
@@ -38,4 +38,4 @@ public class StepOne {
Method main = stepTwo.getDeclaredMethod("main", String[].class);
main.invoke(null, (Object)(new String[]{}));
}
-} \ No newline at end of file
+}