Skip to content

Commit 0e51cab

Browse files
committed
Clean up testing for Jenkins
1 parent b61a75e commit 0e51cab

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

test/dotc/tests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class tests extends CompilerTest {
193193
val javaDir = "./tests/pos/java-interop/"
194194
@Test def java_all = compileFiles(javaDir, twice)
195195

196-
@Test def specialization = compileFile(specialDir, "specialization", List("-Xprint:specialize"))
196+
@Test def simple_specialization = compileFile(specialDir, "simple_specialization", List("-Xprint:specialize"))
197197
@Test def mutual_spec = compileFile(specialDir, "mutual_specialization", List("-Xprint:specialize"))
198198
@Test def return_spec = compileFile(specialDir, "return_specialization", List("-Xprint:specialize"))
199199
@Test def nothing_spec = compileFile(specialDir, "nothing_specialization", List("-Xprint:specialize"))
@@ -205,7 +205,7 @@ class tests extends CompilerTest {
205205
@Test def pos_this_specialization = compileFile(specialDir, "this_specialization", List("-Xprint:specialize"))
206206
@Test def pos_spec_all = compileFiles(specialDir)
207207

208-
@Test def run_spec = runFile(runDir, "specialization")
208+
@Test def run_spec = runFile(runDir, "method-specialization")
209209

210210
//@Test def dotc_compilercommand = compileFile(dotcDir + "config/", "CompilerCommand")
211211
}

tests/pos/specialization/specialization.scala renamed to tests/pos/specialization/simple_specialization.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
trait specialization {
1+
trait simple_specialization {
22
def printer1[@specialized(Int, Long) T](a: T) = {
33
println(a.toString)
44
}

tests/run/specialization.check renamed to tests/run/method-specialization.check

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
82
33
3
44
int
5-
int,double
65
double,int

tests/run/specialization.scala renamed to tests/run/method-specialization.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ object Test extends dotty.runtime.LegacyApp {
3333
println(baz_methods.filter(_.toString.contains("baz")).length)
3434

3535
val baz_int_param = baz_methods.filter(_.toString.contains("$mcI$sp")).head.getParameterTypes.mkString(",")
36-
val bar_int_double_params = bar_methods.filter(s => s.toString.contains("$mcDI$sp") || s.toString.contains("$mcID$sp"))
36+
val bar_int_double_params = bar_methods.filter(s => s.toString.contains("$mcDI$sp"))
3737
println(baz_int_param)
3838
println(bar_int_double_params.head.getParameterTypes.mkString(","))
39-
println(bar_int_double_params.tail.head.getParameterTypes.mkString(","))
4039
}
4140
}

0 commit comments

Comments
 (0)