natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed logic error in ant tests 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@26077 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
michelou 2011-11-27 20:07:45 +00:00
parent 98622693e4
commit da8c20001b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/partest/scala/tools/partest/nest/Worker.scala
View File

@ -11,7 +11,7 @@ import java.net.URL
import java.util.{ Timer, TimerTask }
import scala.tools.nsc.Properties.{ jdkHome, javaHome, propOrElse }
import scala.util.Properties.{ isWin }
import scala.util.Properties.{ envOrElse, isWin }
import scala.tools.nsc.{ Settings, CompilerCommand, Global }
import scala.tools.nsc.io.{ AbstractFile, PlainFile, Path, Directory, File => SFile }
import scala.tools.nsc.reporters.ConsoleReporter
@ -523,7 +523,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor
// Apache Ant 1.6 or newer
def ant(args: Seq[String], output: File): Boolean = {
val antDir = Directory(System.getProperty("ANT_HOME", "/opt/ant/"))
val antDir = Directory(envOrElse("ANT_HOME", "/opt/ant/"))
val antLibDir = Directory(antDir / "lib")
val antLauncherPath = SFile(antLibDir / "ant-launcher.jar").path
val antOptions =