@@ -66,7 +66,7 @@ class stdlibTests extends CompilerTest {
66
66
else List (" -Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef" )
67
67
} ++ checkOptions ++ classPath
68
68
69
- val scala2mode = List (" -language:Scala2" )
69
+ val stdlibMode = List (" -migration " , " -Yno-inline " , " -language:Scala2" )
70
70
71
71
private val linkDCE = List (" -link-dce" , " -Ylink-dce-checks" , " -Ylog:callGraph" )
72
72
private val linkDCEwithVis = " -link-vis" :: linkDCE
@@ -111,15 +111,15 @@ class stdlibTests extends CompilerTest {
111
111
assertTrue(msgMissing, missingFiles.isEmpty)
112
112
}
113
113
114
- @ Test def compileStdLib (): Unit = compileList(" compileStdLib" , stdlibFiles, " -migration " :: " -Yno-inline " :: scala2mode )
114
+ @ Test def compileStdLib (): Unit = compileList(" compileStdLib" , stdlibFiles, stdlibMode )
115
115
116
116
// Test callgraph DCE on code that use DCEed stdlib
117
117
@ Test def link_dce_stdlib_all (): Unit =
118
- runFiles(linkDCEWithStdlibDir, scala2mode ::: linkDCE, stdlibFiles = linkDCEStdlibFiles)
118
+ runFiles(linkDCEWithStdlibDir, stdlibMode ::: linkDCE, stdlibFiles = linkDCEStdlibFiles)
119
119
120
120
@ org.junit.Ignore (" Too long to run in CI" )
121
121
@ Test def link_dce_vis_stdlib_all (): Unit =
122
- runFiles(linkDCEWithStdlibDir, scala2mode ::: linkDCEwithVis, stdlibFiles = linkDCEStdlibFiles)
122
+ runFiles(linkDCEWithStdlibDir, stdlibMode ::: linkDCEwithVis, stdlibFiles = linkDCEStdlibFiles)
123
123
124
124
private def loadList (path : String ): List [String ] = Source .fromFile(path, " UTF8" ).getLines()
125
125
.map(_.trim) // allow identation
0 commit comments