aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2014-02-06 14:47:46 +0100
committerLukas Rytz <lukas.rytz@typesafe.com>2014-02-06 14:47:46 +0100
commit09a87aad0449af38e2efeafb8c3770fb7d61a437 (patch)
tree60c8c31c9b5716398317c7e29cdfb0d8e1f50b8a
parent6015d2bdf2b09ac424087c014af6aa4b8541f2ff (diff)
parent355bbdf8389d141f86ea37995f03f9aae37e6c41 (diff)
downloaddotty-09a87aad0449af38e2efeafb8c3770fb7d61a437.tar.gz
dotty-09a87aad0449af38e2efeafb8c3770fb7d61a437.tar.bz2
dotty-09a87aad0449af38e2efeafb8c3770fb7d61a437.zip
Merge pull request #7 from DarkDimius/paths
Modified tests to use relative paths
-rw-r--r--test/dotc/tests.scala8
-rw-r--r--test/test/ScannerTest.scala8
-rw-r--r--test/test/desugarPackage.scala6
-rw-r--r--test/test/parsePackage.scala6
4 files changed, 14 insertions, 14 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index c32492778..550d1c585 100644
--- 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")
-} \ No newline at end of file
+}
diff --git a/test/test/ScannerTest.scala b/test/test/ScannerTest.scala
index aafc2ee54..9955c08fe 100644
--- 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")
}
-} \ No newline at end of file
+}
diff --git a/test/test/desugarPackage.scala b/test/test/desugarPackage.scala
index 9fb5eb6ec..d38669e7b 100644
--- 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()
}
-} \ No newline at end of file
+}
diff --git a/test/test/parsePackage.scala b/test/test/parsePackage.scala
index 5c74c87ff..da3113f00 100644
--- 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()
}
-} \ No newline at end of file
+}