@@ -28,10 +28,14 @@ class LinkOptimiseTests extends ParallelTesting {
28
28
29
29
@ Test def linkOptimise : Unit = {
30
30
// Setup and compile libraries
31
- def strawmanLibrary =
32
- compileDir(" ../collection-strawman/collections/src/main" , defaultOptions)(TestGroup (" strawmanLibrary" ))
33
- def linkCustomLib =
34
- compileDir(" ../tests/link/custom-lib" , defaultOptions)(TestGroup (" linkCustomLib" ))
31
+ val strawmanLibGroup = TestGroup (" strawmanLibrary" )
32
+ val strawmanLibTestGroup = TestGroup (strawmanLibGroup.name + " /tests" )
33
+
34
+ val linkCustomLibGroup = TestGroup (" linkCustomLib" )
35
+ val linkCustomLibTestGroup = TestGroup (linkCustomLibGroup.name + " /tests" )
36
+
37
+ val strawmanLibrary = compileDir(" ../collection-strawman/collections/src/main" , defaultOptions)(strawmanLibGroup)
38
+ val linkCustomLib = compileDir(" ../tests/link/custom-lib" , defaultOptions)(linkCustomLibGroup)
35
39
36
40
val libraries = {
37
41
strawmanLibrary +
@@ -41,15 +45,16 @@ class LinkOptimiseTests extends ParallelTesting {
41
45
// Setup class paths
42
46
def mkLinkClassFlags (libPath : String ) =
43
47
TestFlags (mkClassPath(libPath :: Jars .dottyTestDeps), mkClassPath(Jars .dottyTestDeps), basicDefaultOptions :+ " -Xlink-optimise" )
44
- val strawmanClassPath = mkLinkClassFlags(defaultOutputDir + " strawmanLibrary /main/" )
45
- val customLibClassFlags = mkLinkClassFlags(defaultOutputDir + " linkCustomLib /custom-lib" )
48
+ val strawmanClassPath = mkLinkClassFlags(defaultOutputDir + strawmanLibGroup.name + " /main/" )
49
+ val customLibClassFlags = mkLinkClassFlags(defaultOutputDir + linkCustomLibGroup.name + " /custom-lib" )
46
50
47
51
// Link tests
48
52
val linkDir = " ../tests/link"
49
53
val linkStramanDir = linkDir + " /strawman"
50
54
val linkCustomLibDir = linkDir + " /on-custom-lib"
51
- def linkStrawmanTest = compileFilesInDir(linkStramanDir, strawmanClassPath)(TestGroup (" linkStrawmanTest" ))
52
- def linkCustomLibTest = compileFilesInDir(linkCustomLibDir, customLibClassFlags)(TestGroup (" linkCustomLibTest" ))
55
+
56
+ val linkStrawmanTest = compileFilesInDir(linkStramanDir, strawmanClassPath)(strawmanLibTestGroup)
57
+ val linkCustomLibTest = compileFilesInDir(linkCustomLibDir, customLibClassFlags)(linkCustomLibTestGroup)
53
58
54
59
def classFileChecks (sourceDir : String , testName : String ) = {
55
60
val checkExt = " .classcheck"
@@ -73,8 +78,8 @@ class LinkOptimiseTests extends ParallelTesting {
73
78
}.keepOutput.checkRuns()
74
79
75
80
try {
76
- classFileChecks(linkStramanDir, " linkStrawmanTest " )
77
- classFileChecks(linkCustomLibDir, " linkCustomLibTest " )
81
+ classFileChecks(linkStramanDir, strawmanLibTestGroup.name )
82
+ classFileChecks(linkCustomLibDir, linkCustomLibTestGroup.name )
78
83
} finally {
79
84
(libraries + tests).delete()
80
85
}
0 commit comments