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

Adjusted some directories 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@14155 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
phaller 2008-02-27 14:10:29 +00:00
parent 97129b8ce5
commit ca88eddebe
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/partest/scala/tools/partest/nest/FileManager.scala
View File

@ -14,9 +14,10 @@ object FileManager {
val PATH_SEP = File.pathSeparatorChar val PATH_SEP = File.pathSeparatorChar
val CLASSPATH = System.getProperty("java.class.path", ".") val CLASSPATH = System.getProperty("java.class.path", ".")
val PREFIX = System.getProperty("user.dir", ".")+"/.."
val SCALAHOME = System.getProperty("scala.home", ".") val SCALAHOME = System.getProperty("scala.home", ".")
NestUI.verbose("SCALAHOME: "+SCALAHOME)
val JAVACMD = System.getProperty("scalatest.javacmd", "java") val JAVACMD = System.getProperty("scalatest.javacmd", "java")
val PREFIX = (new File(SCALAHOME)).getAbsolutePath
/* /*
if [ -d "$PREFIX/test" ]; then if [ -d "$PREFIX/test" ]; then
@ -27,12 +28,12 @@ else
abort "Test directory not found"; abort "Test directory not found";
*/ */
val TESTROOT = { val TESTROOT = {
val test = new File(PREFIX, "test") val test = new File(SCALAHOME, "test")
val scala_test = new File(PREFIX, "misc/scala-test") val scala_test = new File(SCALAHOME, "misc/scala-test")
val testroot = val testroot =
if (test.exists && test.isDirectory) if (test.isDirectory)
test test
else if (scala_test.exists && scala_test.isDirectory) else if (scala_test.isDirectory)
scala_test scala_test
else else
error("Test directory not found") error("Test directory not found")