git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug/JAL-3065_DH_keyPair_Exception_nogroovysettings' into releases/Relea...
[jalview.git]
/
test
/
jalview
/
bin
/
CommandLineOperations.java
diff --git
a/test/jalview/bin/CommandLineOperations.java
b/test/jalview/bin/CommandLineOperations.java
index
2b40a72
..
9b94be9
100644
(file)
--- a/
test/jalview/bin/CommandLineOperations.java
+++ b/
test/jalview/bin/CommandLineOperations.java
@@
-116,9
+116,15
@@
public class CommandLineOperations
private Worker jalviewDesktopRunner(boolean withAwt, String cmd,
int timeout)
{
private Worker jalviewDesktopRunner(boolean withAwt, String cmd,
int timeout)
{
+ String cp_sep = ":";
+ if (System.getProperty("os.name").indexOf("Windows") >= 0)
+ {
+ cp_sep = ";";
+ }
String _cmd = "java "
+ (withAwt ? "-Djava.awt.headless=true" : "")
String _cmd = "java "
+ (withAwt ? "-Djava.awt.headless=true" : "")
- + " -classpath \"./lib/*:./classes\" jalview.bin.Jalview ";
+ + " -classpath \"./lib/*" + cp_sep
+ + "./classes\" jalview.bin.Jalview ";
System.out.println("CMD [" + cmd + "]");
Process ls2_proc = null;
Worker worker = null;
System.out.println("CMD [" + cmd + "]");
Process ls2_proc = null;
Worker worker = null;