@@ -1038,7 +1038,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
1038
1038
val sourceFile = new JFile (f)
1039
1039
val parent = sourceFile.getParentFile
1040
1040
val outDir =
1041
- outDirectory + testGroup.name + " /" +
1041
+ outDirectory + testGroup + " /" +
1042
1042
sourceFile.getName.substring(0 , sourceFile.getName.lastIndexOf('.' )) + " /"
1043
1043
1044
1044
require(
@@ -1064,7 +1064,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
1064
1064
* can be used for randomization.
1065
1065
*/
1066
1066
def compileDir (f : String , flags : TestFlags , randomOrder : Option [Int ] = None , outDirectory : String = defaultOutputDir)(implicit testGroup : TestGroup ): CompilationTest = {
1067
- val outDir = outDirectory + testGroup.name + " /"
1067
+ val outDir = outDirectory + testGroup + " /"
1068
1068
val sourceDir = new JFile (f)
1069
1069
checkRequirements(f, sourceDir, outDir)
1070
1070
@@ -1083,7 +1083,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
1083
1083
val targetDir = new JFile (outDir + " /" + sourceDir.getName + " /" )
1084
1084
targetDir.mkdirs()
1085
1085
1086
- val target = JointCompilationSource (s " compiling ' $f' in test ' ${ testGroup.name} ' " , randomized, flags, targetDir)
1086
+ val target = JointCompilationSource (s " compiling ' $f' in test ' $testGroup' " , randomized, flags, targetDir)
1087
1087
new CompilationTest (target)
1088
1088
}
1089
1089
@@ -1092,14 +1092,14 @@ trait ParallelTesting extends RunnerOrchestration { self =>
1092
1092
* dissociated
1093
1093
*/
1094
1094
def compileList (testName : String , files : List [String ], flags : TestFlags , outDirectory : String = defaultOutputDir)(implicit testGroup : TestGroup ): CompilationTest = {
1095
- val outDir = outDirectory + testGroup.name + " /" + testName + " /"
1095
+ val outDir = outDirectory + testGroup + " /" + testName + " /"
1096
1096
1097
1097
// Directories in which to compile all containing files with `flags`:
1098
1098
val targetDir = new JFile (outDir)
1099
1099
targetDir.mkdirs()
1100
1100
assert(targetDir.exists, s " couldn't create target directory: $targetDir" )
1101
1101
1102
- val target = JointCompilationSource (s " $testName from ${ testGroup.name} " , files.map(new JFile (_)).toArray, flags, targetDir)
1102
+ val target = JointCompilationSource (s " $testName from $testGroup" , files.map(new JFile (_)).toArray, flags, targetDir)
1103
1103
1104
1104
// Create a CompilationTest and let the user decide whether to execute a pos or a neg test
1105
1105
new CompilationTest (target)
@@ -1123,7 +1123,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
1123
1123
* the same name as the directory (with the file extension `.check`)
1124
1124
*/
1125
1125
def compileFilesInDir (f : String , flags : TestFlags , outDirectory : String = defaultOutputDir)(implicit testGroup : TestGroup ): CompilationTest = {
1126
- val outDir = outDirectory + testGroup.name + " /"
1126
+ val outDir = outDirectory + testGroup + " /"
1127
1127
val sourceDir = new JFile (f)
1128
1128
checkRequirements(f, sourceDir, outDir)
1129
1129
@@ -1142,7 +1142,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
1142
1142
* tests.
1143
1143
*/
1144
1144
def compileShallowFilesInDir (f : String , flags : TestFlags , outDirectory : String = defaultOutputDir)(implicit testGroup : TestGroup ): CompilationTest = {
1145
- val outDir = outDirectory + testGroup.name + " /"
1145
+ val outDir = outDirectory + testGroup + " /"
1146
1146
val sourceDir = new JFile (f)
1147
1147
checkRequirements(f, sourceDir, outDir)
1148
1148
0 commit comments