aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Petrashko <dmitry.petrashko@gmail.com>2015-11-09 12:32:03 +0100
committerDmitry Petrashko <dmitry.petrashko@gmail.com>2015-11-10 15:58:32 +0100
commit52872cb21e5f898c6acfdc8c19d1d10c1224460c (patch)
tree7cede4a1d3206def0e4dee17b140dce69936802e
parent7cfd3cad248f4b82da61d324c2724e779ddc5fe0 (diff)
downloaddotty-52872cb21e5f898c6acfdc8c19d1d10c1224460c.tar.gz
dotty-52872cb21e5f898c6acfdc8c19d1d10c1224460c.tar.bz2
dotty-52872cb21e5f898c6acfdc8c19d1d10c1224460c.zip
Check that Iterator.scala compiles on jenkins.
-rw-r--r--test/dotc/build.scala2
-rw-r--r--test/dotc/tests.scala7
2 files changed, 5 insertions, 4 deletions
diff --git a/test/dotc/build.scala b/test/dotc/build.scala
index 2963b8f1e..643b4aa43 100644
--- a/test/dotc/build.scala
+++ b/test/dotc/build.scala
@@ -23,7 +23,7 @@ object build extends tests {
deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output
val keepFile = new File(defaultOutputDir + ".keep")
keepFile.createNewFile()
- dotty // build output dir
+ //dotty // build output dir
val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", "."))
p.waitFor()
p
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index 1bd37125f..ead5a7699 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -51,7 +51,7 @@ class tests extends CompilerTest {
val toolsDir = dottyDir + "tools/"
val dotcDir = toolsDir + "dotc/"
val coreDir = dotcDir + "core/"
-
+ /*
@Test def pickle_pickleOK = compileDir(testsDir, "pickling", testPickling)
// This directory doesn't exist anymore
// @Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling)
@@ -170,7 +170,7 @@ class tests extends CompilerTest {
@Test def neg_validateRefchecks = compileFile(negDir, "validate-refchecks", xerrors = 2)
@Test def run_all = runFiles(runDir)
-
+ */
val stdlibFiles = Source.fromFile("./test/dotc/scala-collections.whitelist", "UTF8").getLines()
.map(_.trim) // allow identation
.filter(!_.startsWith("#")) // allow comment lines prefixed by #
@@ -179,7 +179,7 @@ class tests extends CompilerTest {
.toList
@Test def compileStdLib = compileList("compileStdLib", stdlibFiles, "-migration" :: scala2mode)
- @Test def dotty = compileDir(dottyDir, ".", "-deep" :: "-Ycheck-reentrant" :: allowDeepSubtypes) // note the -deep argument
+ /* @Test def dotty = compileDir(dottyDir, ".", "-deep" :: "-Ycheck-reentrant" :: allowDeepSubtypes) // note the -deep argument
@Test def dotc_ast = compileDir(dotcDir, "ast")
@Test def dotc_config = compileDir(dotcDir, "config")
@@ -223,4 +223,5 @@ class tests extends CompilerTest {
val javaDir = "./tests/pos/java-interop/"
@Test def java_all = compileFiles(javaDir, twice)
//@Test def dotc_compilercommand = compileFile(dotcDir + "config/", "CompilerCommand")
+ */
}