diff options
author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-11-09 21:01:00 +0100 |
---|---|---|
committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-11-10 16:01:24 +0100 |
commit | bd54033336526864340d6127a85be71b61ed4bad (patch) | |
tree | 65cfe3ebdf1113243f936e13b3ed44f03583605e | |
parent | bdd291c120b3e9592d068083434be6f54e6e355d (diff) | |
download | dotty-bd54033336526864340d6127a85be71b61ed4bad.tar.gz dotty-bd54033336526864340d6127a85be71b61ed4bad.tar.bz2 dotty-bd54033336526864340d6127a85be71b61ed4bad.zip |
Revert "Check that Iterator.scala compiles on jenkins."
This reverts commit 05e47a4ac03cad65932a5bbddf506b91e6604f38.
-rw-r--r-- | test/dotc/build.scala | 2 | ||||
-rw-r--r-- | test/dotc/tests.scala | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/test/dotc/build.scala b/test/dotc/build.scala index 643b4aa43..2963b8f1e 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 ead5a7699..1bd37125f 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,5 +223,4 @@ 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") - */ } |