diff options
author | Stefan Zeiger <szeiger@novocode.com> | 2011-11-21 18:27:42 +0000 |
---|---|---|
committer | Stefan Zeiger <szeiger@novocode.com> | 2011-11-21 18:27:42 +0000 |
commit | f9278123ebc33bbd4833e431575c4d1b22404d57 (patch) | |
tree | ab318ddfb4173ac85e525b426d77ca2d6a079b0d | |
parent | e3fcce9c0babc0d597cfaae36ed5b88a1588b541 (diff) | |
download | scala-f9278123ebc33bbd4833e431575c4d1b22404d57.tar.gz scala-f9278123ebc33bbd4833e431575c4d1b22404d57.tar.bz2 scala-f9278123ebc33bbd4833e431575c4d1b22404d57.zip |
Always build command lines in partest as Seq[St...
Always build command lines in partest as Seq[String] instead of
space-separated command.
Closes SI-1510 which is actually caused by a bad command line string
when the path to Java contains a space, and not by long path names
per se. References SI-622 since this commit fixes the specific error
described there (not closing because follow-up bugs remain).
-rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 5403e1954f..4cc1c87c82 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -283,10 +283,6 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor /** Runs command redirecting standard out and * error out to output file. */ - def runCommand(command: String, outFile: File): Boolean = { - NestUI.verbose("running command:\n"+command) - (command #> outFile !) == 0 - } def runCommand(args: Seq[String], outFile: File): Boolean = { NestUI.verbose("running command:\n"+args.map(" " + _ + "\n").mkString) (Process(args) #> outFile !) == 0 @@ -336,20 +332,17 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor ) ++ extras val classpath = if (classpathPrefix != "") join(classpathPrefix, CLASSPATH) else CLASSPATH - val cmd = ( - List( - javaCmd, - JAVA_OPTS, - argString, + val cmd = javaCmd +: ( + (JAVA_OPTS.split(' ') ++ argString.split(' ')).map(_.trim).filter(_ != "") ++ Seq( "-classpath", join(outDir.toString, classpath) - ) ++ propertyOptions ++ List( + ) ++ propertyOptions ++ Seq( "scala.tools.nsc.MainGenericRunner", "-usejavacp", "Test", "jvm" ) - ) mkString " " + ) runCommand(cmd, logFile) } |