@@ -241,19 +241,22 @@ class CompilationTests extends ParallelTesting {
241
241
*/
242
242
@ Test def tastyBootstrap : Unit = {
243
243
implicit val testGroup : TestGroup = TestGroup (" tastyBootstrap" )
244
+ val dotty1Group = TestGroup (" dotty1" )
245
+ val dotty2Group = TestGroup (" dotty2" )
246
+ val libGroup = TestGroup (" lib" )
244
247
245
248
val opt = TestFlags (
246
249
// compile with bootstrapped library on cp:
247
- defaultOutputDir + " lib /src/:" +
250
+ defaultOutputDir + libGroup.name + " /src/:" +
248
251
// as well as bootstrapped compiler:
249
- defaultOutputDir + " dotty1 /dotty/:" +
252
+ defaultOutputDir + dotty1Group.name + " /dotty/:" +
250
253
Jars .dottyInterfaces,
251
254
Array (" -Ycheck-reentrant" )
252
255
)
253
256
254
- def lib =
257
+ val lib =
255
258
compileDir(" ../library/src" ,
256
- defaultOptions.and(" -Ycheck-reentrant" , " -strict" , " -priorityclasspath" , defaultOutputDir))
259
+ defaultOptions.and(" -Ycheck-reentrant" , " -strict" , " -priorityclasspath" , defaultOutputDir))(libGroup)
257
260
258
261
val compilerDir = Paths .get(" ../compiler/src" )
259
262
val compilerSources = sources(Files .walk(compilerDir))
@@ -272,19 +275,8 @@ class CompilationTests extends ParallelTesting {
272
275
val backendJvmSources =
273
276
sources(Files .list(backendJvmDir), excludedFiles = backendJvmExcluded)
274
277
275
- def dotty1 = {
276
- compileList(
277
- " dotty" ,
278
- compilerSources ++ backendSources ++ backendJvmSources,
279
- opt)(TestGroup (" dotty1" ))
280
- }
281
-
282
- def dotty2 = {
283
- compileList(
284
- " dotty" ,
285
- compilerSources ++ backendSources ++ backendJvmSources,
286
- opt)(TestGroup (" dotty2" ))
287
- }
278
+ val dotty1 = compileList(" dotty" , compilerSources ++ backendSources ++ backendJvmSources, opt)(dotty1Group)
279
+ val dotty2 = compileList(" dotty" , compilerSources ++ backendSources ++ backendJvmSources, opt)(dotty2Group)
288
280
289
281
val tests = {
290
282
lib.keepOutput :: dotty1.keepOutput :: {
@@ -305,8 +297,9 @@ class CompilationTests extends ParallelTesting {
305
297
}.keepOutput :: Nil
306
298
}.map(_.checkCompile())
307
299
308
- assert(new java.io.File (" ../out/dotty1/dotty/" ).exists)
309
- assert(new java.io.File (" ../out/dotty2/dotty/" ).exists)
300
+ assert(new java.io.File (s " ../out/ ${dotty1Group.name}/dotty/ " ).exists)
301
+ assert(new java.io.File (s " ../out/ ${dotty2Group.name}/dotty/ " ).exists)
302
+ assert(new java.io.File (s " ../out/ ${libGroup.name}/src/ " ).exists)
310
303
compileList(" idempotency" , List (" ../tests/idempotency/BootstrapChecker.scala" , " ../tests/idempotency/IdempotencyCheck.scala" ), defaultOptions).checkRuns()
311
304
312
305
tests.foreach(_.delete())
0 commit comments