diff options
| author | Philipp Haller <hallerp@gmail.com> | 2008-02-27 14:10:29 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2008-02-27 14:10:29 +0000 |
| commit | f97742d56299dfdc9e85db81ae89683e20eede9e (patch) | |
| tree | ee67df814aa339d48ab656c214c73075ee109dad /src/partest | |
| parent | 63f65cfaf233835f038d2004e433e257cc869be4 (diff) | |
| download | scala-f97742d56299dfdc9e85db81ae89683e20eede9e.tar.gz scala-f97742d56299dfdc9e85db81ae89683e20eede9e.tar.bz2 scala-f97742d56299dfdc9e85db81ae89683e20eede9e.zip | |
Adjusted some directories
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/FileManager.scala | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala index 5346a40c53..08f11da3d3 100644 --- a/src/partest/scala/tools/partest/nest/FileManager.scala +++ b/src/partest/scala/tools/partest/nest/FileManager.scala @@ -14,9 +14,10 @@ object FileManager { val PATH_SEP = File.pathSeparatorChar val CLASSPATH = System.getProperty("java.class.path", ".") - val PREFIX = System.getProperty("user.dir", ".")+"/.." val SCALAHOME = System.getProperty("scala.home", ".") + NestUI.verbose("SCALAHOME: "+SCALAHOME) val JAVACMD = System.getProperty("scalatest.javacmd", "java") + val PREFIX = (new File(SCALAHOME)).getAbsolutePath /* if [ -d "$PREFIX/test" ]; then @@ -27,12 +28,12 @@ else abort "Test directory not found"; */ val TESTROOT = { - val test = new File(PREFIX, "test") - val scala_test = new File(PREFIX, "misc/scala-test") + val test = new File(SCALAHOME, "test") + val scala_test = new File(SCALAHOME, "misc/scala-test") val testroot = - if (test.exists && test.isDirectory) + if (test.isDirectory) test - else if (scala_test.exists && scala_test.isDirectory) + else if (scala_test.isDirectory) scala_test else error("Test directory not found") |