Skip to content

Commit 09a87aa

Browse files
committed
Merge pull request #7 from DarkDimius/paths
Modified tests to use relative paths
2 parents 6015d2b + 355bbdf commit 09a87aa

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

test/dotc/tests.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ class tests extends CompilerTest {
1414
// "-Yshow-suppressed-errors",
1515
"-pagewidth", "160")
1616

17-
val posDir = "/Users/odersky/workspace/dotty/tests/pos/"
18-
val negDir = "/Users/odersky/workspace/dotty/tests/neg/"
19-
val dotcDir = "/Users/odersky/workspace/dotty/src/dotty/"
17+
val posDir = "./tests/pos/"
18+
val negDir = "./tests/neg/"
19+
val dotcDir = "./src/dotty/"
2020

2121
@Test def pos_Coder() = compileFile(posDir, "Coder")
2222
@Test def pos_blockescapes() = compileFile(posDir, "blockescapes")
@@ -67,4 +67,4 @@ class tests extends CompilerTest {
6767
"-Xprompt"))
6868

6969
//@Test def dotc_compilercommand = compileFile(dotcDir + "tools/dotc/config/", "CompilerCommand")
70-
}
70+
}

test/test/ScannerTest.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import org.junit.Test
99
class ScannerTest extends DottyTest {
1010

1111
val blackList = List(
12-
"/Users/odersky/workspace/scala/src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala",
13-
"/Users/odersky/workspace/scala/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala"
12+
"../scala/src/scaladoc/scala/tools/nsc/doc/html/page/Index.scala",
13+
"../scala/src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala"
1414
)
1515

1616
def scan(name: String): Unit = scan(new PlainFile(name))
@@ -58,6 +58,6 @@ class ScannerTest extends DottyTest {
5858

5959
@Test
6060
def scanScala() = {
61-
scanDir("/Users/odersky/workspace/scala/src")
61+
scanDir("../scala/src")
6262
}
63-
}
63+
}

test/test/desugarPackage.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ object desugarPackage extends DeSugarTest {
1010
reset()
1111
val start = System.nanoTime()
1212
val startNodes = Trees.ntrees
13-
parseDir("/Users/odersky/workspace/dotty/src")
14-
parseDir("/Users/odersky/workspace/scala/src")
13+
parseDir("./src")
14+
parseDir("../scala/src")
1515
val ms1 = (System.nanoTime() - start)/1000000
1616
val nodes = Trees.ntrees
1717
val buf = parsedTrees map desugarTree
@@ -24,4 +24,4 @@ object desugarPackage extends DeSugarTest {
2424
// parse("/Users/odersky/workspace/scala/src/compiler/scala/tools/nsc/doc/model/ModelFactoryTypeSupport.scala")
2525
for (i <- 0 until 10) test()
2626
}
27-
}
27+
}

test/test/parsePackage.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ object parsePackage extends ParserTest {
6565
reset()
6666
nodes = 0
6767
val start = System.nanoTime()
68-
parseDir("/Users/odersky/workspace/dotty/src")
69-
parseDir("/Users/odersky/workspace/scala/src")
68+
parseDir("./src")
69+
parseDir("../scala/src")
7070
val ms1 = (System.nanoTime() - start)/1000000
7171
val buf = parsedTrees map transformer.transform
7272
val ms2 = (System.nanoTime() - start)/1000000
@@ -78,4 +78,4 @@ object parsePackage extends ParserTest {
7878
// parse("/Users/odersky/workspace/scala/src/compiler/scala/tools/nsc/doc/model/ModelFactoryTypeSupport.scala")
7979
for (i <- 0 until 10) test()
8080
}
81-
}
81+
}

0 commit comments

Comments
 (0)