Merge pull request scala#7 from DarkDimius/paths

Modified tests to use relative paths
G1ng3r · Feb 6, 2014 · 09a87aa · 09a87aa
2 parents 6015d2b + 355bbdf
commit 09a87aa
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
@@ -14,9 +14,9 @@ class tests extends CompilerTest {
 //        "-Yshow-suppressed-errors",
         "-pagewidth", "160")
 
-  val posDir = "/Users/odersky/workspace/dotty/tests/pos/"
-  val negDir = "/Users/odersky/workspace/dotty/tests/neg/"
-  val dotcDir = "/Users/odersky/workspace/dotty/src/dotty/"
+  val posDir = "./tests/pos/"
+  val negDir = "./tests/neg/"
+  val dotcDir = "./src/dotty/"
 
   @Test def pos_Coder() = compileFile(posDir, "Coder")
   @Test def pos_blockescapes() = compileFile(posDir, "blockescapes")
@@ -67,4 +67,4 @@ class tests extends CompilerTest {
       "-Xprompt"))
 
   //@Test def dotc_compilercommand = compileFile(dotcDir + "tools/dotc/config/", "CompilerCommand")
-}
+}
diff --git a/test/test/ScannerTest.scala b/test/test/ScannerTest.scala
@@ -9,8 +9,8 @@ import org.junit.Test
 class ScannerTest extends DottyTest {
 
   val blackList = List(
-      "/Users/odersky/workspace/scala/src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala",
-      "/Users/odersky/workspace/scala/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala"
+      "../scala/src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala",
+      "../scala/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala"
     )
 
   def scan(name: String): Unit = scan(new PlainFile(name))
@@ -58,6 +58,6 @@ class ScannerTest extends DottyTest {
 
   @Test
   def scanScala() = {
-    scanDir("/Users/odersky/workspace/scala/src")
+    scanDir("../scala/src")
   }
-}
+}
diff --git a/test/test/desugarPackage.scala b/test/test/desugarPackage.scala
@@ -10,8 +10,8 @@ object desugarPackage extends DeSugarTest {
     reset()
     val start = System.nanoTime()
     val startNodes = Trees.ntrees
-    parseDir("/Users/odersky/workspace/dotty/src")
-    parseDir("/Users/odersky/workspace/scala/src")
+    parseDir("./src")
+    parseDir("../scala/src")
     val ms1 = (System.nanoTime() - start)/1000000
     val nodes = Trees.ntrees
     val buf = parsedTrees map desugarTree
@@ -24,4 +24,4 @@ object desugarPackage extends DeSugarTest {
 //    parse("/Users/odersky/workspace/scala/src/compiler/scala/tools/nsc/doc/model/ModelFactoryTypeSupport.scala")
     for (i <- 0 until 10) test()
   }
-}
+}
diff --git a/test/test/parsePackage.scala b/test/test/parsePackage.scala
@@ -65,8 +65,8 @@ object parsePackage extends ParserTest {
     reset()
     nodes = 0
     val start = System.nanoTime()
-    parseDir("/Users/odersky/workspace/dotty/src")
-    parseDir("/Users/odersky/workspace/scala/src")
+    parseDir("./src")
+    parseDir("../scala/src")
     val ms1 = (System.nanoTime() - start)/1000000
     val buf = parsedTrees map transformer.transform
     val ms2 = (System.nanoTime() - start)/1000000
@@ -78,4 +78,4 @@ object parsePackage extends ParserTest {
 //    parse("/Users/odersky/workspace/scala/src/compiler/scala/tools/nsc/doc/model/ModelFactoryTypeSupport.scala")
     for (i <- 0 until 10) test()
   }
-}
+}