Skip to content

Modified tests to use relative paths #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 6, 2014
Merged

Modified tests to use relative paths #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ab2192
Use relative paths in tests
DarkDimius Feb 6, 2014
c11a46e
Update readme
DarkDimius Feb 6, 2014
6d3902b
One more absolute path changed to relative
DarkDimius Feb 6, 2014
355bbdf
Merge branch 'master' of github.com:lampepfl/dotty into paths
DarkDimius Feb 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/dotc/tests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -67,4 +67,4 @@ class tests extends CompilerTest {
"-Xprompt"))

//@Test def dotc_compilercommand = compileFile(dotcDir + "tools/dotc/config/", "CompilerCommand")
}
}
8 changes: 4 additions & 4 deletions test/test/ScannerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -58,6 +58,6 @@ class ScannerTest extends DottyTest {

@Test
def scanScala() = {
scanDir("/Users/odersky/workspace/scala/src")
scanDir("../scala/src")
}
}
}
6 changes: 3 additions & 3 deletions test/test/desugarPackage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
}
}
}
6 changes: 3 additions & 3 deletions test/test/parsePackage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
}
}
}