Skip to content

Commit 55d4609

Browse files
committed
Add missing flags for stdlib CG tests
1 parent 308ac10 commit 55d4609

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

compiler/test/dotc/stdlibTests.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class stdlibTests extends CompilerTest {
6666
else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef")
6767
} ++ checkOptions ++ classPath
6868

69-
val scala2mode = List("-language:Scala2")
69+
val stdlibMode = List("-migration", "-Yno-inline", "-language:Scala2")
7070

7171
private val linkDCE = List("-link-dce", "-Ylink-dce-checks", "-Ylog:callGraph")
7272
private val linkDCEwithVis = "-link-vis" :: linkDCE
@@ -111,15 +111,15 @@ class stdlibTests extends CompilerTest {
111111
assertTrue(msgMissing, missingFiles.isEmpty)
112112
}
113113

114-
@Test def compileStdLib(): Unit = compileList("compileStdLib", stdlibFiles, "-migration" :: "-Yno-inline" :: scala2mode)
114+
@Test def compileStdLib(): Unit = compileList("compileStdLib", stdlibFiles, stdlibMode)
115115

116116
// Test callgraph DCE on code that use DCEed stdlib
117117
@Test def link_dce_stdlib_all(): Unit =
118-
runFiles(linkDCEWithStdlibDir, scala2mode ::: linkDCE, stdlibFiles = linkDCEStdlibFiles)
118+
runFiles(linkDCEWithStdlibDir, stdlibMode ::: linkDCE, stdlibFiles = linkDCEStdlibFiles)
119119

120120
@org.junit.Ignore("Too long to run in CI")
121121
@Test def link_dce_vis_stdlib_all(): Unit =
122-
runFiles(linkDCEWithStdlibDir, scala2mode ::: linkDCEwithVis, stdlibFiles = linkDCEStdlibFiles)
122+
runFiles(linkDCEWithStdlibDir, stdlibMode ::: linkDCEwithVis, stdlibFiles = linkDCEStdlibFiles)
123123

124124
private def loadList(path: String): List[String] = Source.fromFile(path, "UTF8").getLines()
125125
.map(_.trim) // allow identation

0 commit comments

Comments
 (0)