summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-02-18 18:49:21 +0000
committerPaul Phillips <paulp@improving.org>2010-02-18 18:49:21 +0000
commit388a0c0d1db3e41e3acbebd6e1e4c79f7d176ca3 (patch)
treef1f5df26496c614446cea6b970f48c6659ad803d /test
parent23e5428008fc88377e59a1a5c20d5476c586d62e (diff)
downloadscala-388a0c0d1db3e41e3acbebd6e1e4c79f7d176ca3.tar.gz
scala-388a0c0d1db3e41e3acbebd6e1e4c79f7d176ca3.tar.bz2
scala-388a0c0d1db3e41e3acbebd6e1e4c79f7d176ca3.zip
The first reasonably satisfying classpath commit.
there with this one. Documentation to come. Review by community.
Diffstat (limited to 'test')
-rw-r--r--test/files/run/programmatic-main.scala5
1 files changed, 3 insertions, 2 deletions
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"))