From 388a0c0d1db3e41e3acbebd6e1e4c79f7d176ca3 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 18 Feb 2010 18:49:21 +0000 Subject: The first reasonably satisfying classpath commit. there with this one. Documentation to come. Review by community. --- test/files/run/programmatic-main.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/files/run/programmatic-main.scala b/test/files/run/programmatic-main.scala index b6fbdb9d30..0e91d219a7 100644 --- a/test/files/run/programmatic-main.scala +++ b/test/files/run/programmatic-main.scala @@ -3,8 +3,9 @@ import io.Path object Test { - val basedir = (Path(System.getProperty("scalatest.cwd")).parent / "lib").path - val baseargs = Array("-bootclasspath", basedir + "scala-library.jar", "-cp", basedir + "scala-compiler.jar") + val cwd = Option(System.getProperty("scalatest.cwd")) getOrElse "." + val basedir = (Path(cwd).parent / "lib").path + val baseargs = Array("-bootclasspath", basedir + "/scala-library.jar", "-cp", basedir + "/scala-compiler.jar") def main(args: Array[String]): Unit = { Main process (baseargs ++ Array("-Xshow-phases")) -- cgit v1.2.3