@@ -404,9 +404,11 @@ trait ParallelTesting extends RunnerOrchestration { self =>
404
404
tastyOutput.mkdir()
405
405
val flags = flags0 and (" -d" , tastyOutput.getAbsolutePath) and " -from-tasty"
406
406
407
- def hasTastyFileToClassName (f : JFile ): String =
408
- targetDir.toPath.relativize(f.toPath).toString.dropRight(" .hasTasty" .length).replace('/' , '.' )
409
- val classes = flattenFiles(targetDir).filter(isHasTastyFile).map(hasTastyFileToClassName)
407
+ def tastyFileToClassName (f : JFile ): String = {
408
+ val pathStr = targetDir.toPath.relativize(f.toPath).toString.replace('/' , '.' )
409
+ pathStr.stripSuffix(" .tasty" ).stripSuffix(" .hasTasty" )
410
+ }
411
+ val classes = flattenFiles(targetDir).filter(isHasTastyFile).map(tastyFileToClassName)
410
412
411
413
val reporter =
412
414
TestReporter .reporter(realStdout, logLevel =
@@ -434,7 +436,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
434
436
" -decompile" and " -pagewidth" and " 80"
435
437
436
438
def hasTastyFileToClassName (f : JFile ): String =
437
- targetDir0.toPath.relativize(f.toPath).toString.dropRight (" .hasTasty" .length ).replace('/' , '.' )
439
+ targetDir0.toPath.relativize(f.toPath).toString.stripSuffix (" .hasTasty" ).stripSuffix( " .tasty " ).replace('/' , '.' )
438
440
val classes = flattenFiles(targetDir0).filter(isHasTastyFile).map(hasTastyFileToClassName).sorted
439
441
440
442
val reporter =
@@ -1362,5 +1364,5 @@ object ParallelTesting {
1362
1364
}
1363
1365
1364
1366
def isHasTastyFile (f : JFile ): Boolean =
1365
- f.getName.endsWith(" .hasTasty" )
1367
+ f.getName.endsWith(" .hasTasty" ) || f.getName.endsWith( " .tasty " )
1366
1368
}
0 commit comments