Skip to content

Commit c5fa727

Browse files
committed
Optimise test framework lookup times by restricting to max 1 unknown test framework on Scala Native/Scala.js
1 parent b09a742 commit c5fa727

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

modules/test-runner/src/main/scala/scala/build/testrunner/AsmTestRunner.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scala.build.testrunner
22

33
import org.objectweb.asm
4-
import sbt.testing._
4+
import sbt.testing.{Logger => _, _}
55

66
import java.io.{ByteArrayInputStream, ByteArrayOutputStream, InputStream}
77
import java.nio.charset.StandardCharsets
@@ -206,7 +206,6 @@ object AsmTestRunner {
206206
parentInspector: ParentInspector
207207
): List[String] = {
208208
val preferredClassesByteCode = preferredClasses
209-
.iterator
210209
.map(_.replace('.', '/'))
211210
.flatMap { name =>
212211
findInClassPath(classPath, name + ".class")
@@ -215,7 +214,7 @@ object AsmTestRunner {
215214
(name, () => openStream())
216215
}
217216
}
218-
(preferredClassesByteCode ++ listClassesByteCode(classPath, true))
217+
(preferredClassesByteCode.iterator ++ listClassesByteCode(classPath, true))
219218
.flatMap {
220219
case (moduleInfo, _) if moduleInfo.contains("module-info") => Iterator.empty
221220
case (name, is) =>
@@ -233,6 +232,7 @@ object AsmTestRunner {
233232
else
234233
Iterator.empty
235234
}
235+
.take(math.max(preferredClassesByteCode.length, 1))
236236
.toList
237237
}
238238

0 commit comments

Comments
 (0)