Skip to content

Commit ffd30d3

Browse files
committed
Revert "Check that Iterator.scala compiles on jenkins."
This reverts commit 05e47a4.
1 parent f13d741 commit ffd30d3

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

test/dotc/build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ object build extends tests {
2323
deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output
2424
val keepFile = new File(defaultOutputDir + ".keep")
2525
keepFile.createNewFile()
26-
//dotty // build output dir
26+
dotty // build output dir
2727
val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", "."))
2828
p.waitFor()
2929
p

test/dotc/tests.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class tests extends CompilerTest {
5151
val toolsDir = dottyDir + "tools/"
5252
val dotcDir = toolsDir + "dotc/"
5353
val coreDir = dotcDir + "core/"
54-
/*
54+
5555
@Test def pickle_pickleOK = compileDir(testsDir, "pickling", testPickling)
5656
// This directory doesn't exist anymore
5757
// @Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling)
@@ -170,7 +170,7 @@ class tests extends CompilerTest {
170170
@Test def neg_validateRefchecks = compileFile(negDir, "validate-refchecks", xerrors = 2)
171171

172172
@Test def run_all = runFiles(runDir)
173-
*/
173+
174174
val stdlibFiles = Source.fromFile("./test/dotc/scala-collections.whitelist", "UTF8").getLines()
175175
.map(_.trim) // allow identation
176176
.filter(!_.startsWith("#")) // allow comment lines prefixed by #
@@ -179,7 +179,7 @@ class tests extends CompilerTest {
179179
.toList
180180

181181
@Test def compileStdLib = compileList("compileStdLib", stdlibFiles, "-migration" :: scala2mode)
182-
/* @Test def dotty = compileDir(dottyDir, ".", "-deep" :: "-Ycheck-reentrant" :: allowDeepSubtypes) // note the -deep argument
182+
@Test def dotty = compileDir(dottyDir, ".", "-deep" :: "-Ycheck-reentrant" :: allowDeepSubtypes) // note the -deep argument
183183

184184
@Test def dotc_ast = compileDir(dotcDir, "ast")
185185
@Test def dotc_config = compileDir(dotcDir, "config")
@@ -223,5 +223,4 @@ class tests extends CompilerTest {
223223
val javaDir = "./tests/pos/java-interop/"
224224
@Test def java_all = compileFiles(javaDir, twice)
225225
//@Test def dotc_compilercommand = compileFile(dotcDir + "config/", "CompilerCommand")
226-
*/
227226
}

0 commit comments

Comments
 (0)