luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Flip testForkedParallel to true

This commit is contained in:
Eugene Yokota 2025-08-07 04:38:10 -04:00
parent d267bce6dc
commit 42010a317e
4 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/Defaults.scala
View File

@ -201,7 +201,7 @@ object Defaults extends BuildCommon {
discoveredJavaHomes := CrossJava.discoverJavaHomes, discoveredJavaHomes := CrossJava.discoverJavaHomes,
javaHomes :== ListMap.empty, javaHomes :== ListMap.empty,
fullJavaHomes := CrossJava.expandJavaHomes(discoveredJavaHomes.value ++ javaHomes.value), fullJavaHomes := CrossJava.expandJavaHomes(discoveredJavaHomes.value ++ javaHomes.value),
testForkedParallel :== false, testForkedParallel :== true,
javaOptions :== Nil, javaOptions :== Nil,
sbtPlugin :== false, sbtPlugin :== false,
isMetaBuild :== false, isMetaBuild :== false,

22
sbt-app/src/sbt-test/tests/fork-parallel/build.sbt
View File

@ -1,27 +1,23 @@
import Tests._ import Tests._
import Defaults._ import Defaults._
ThisBuild / scalaVersion := "2.12.20" scalaVersion := "2.12.20"
val check = taskKey[Unit]("Check that tests are executed in parallel") val check = taskKey[Unit]("Check that tests are executed in parallel")
lazy val root = (project in file(".")) libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
.settings( Test / fork := true
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
Test / fork := true,
check := { check := {
val nbProc = java.lang.Runtime.getRuntime().availableProcessors() val nbProc = java.lang.Runtime.getRuntime().availableProcessors()
val log = streams.value.log val log = streams.value.log
if( nbProc < 4 ) { if nbProc < 4 then
log.warn("With fewer than 4 processors this test is meaningless") log.warn("With fewer than 4 processors this test is meaningless")
// mimic behavior expected by scripted // mimic behavior expected by scripted
if (!testForkedParallel.value) sys.error("Exiting with error (note: test not performed)") if !testForkedParallel.value then sys.error("Exiting with error (note: test not performed)")
} else { else
// we've got at least 4 processors, we'll check the upper end but also 3 and 4 as the upper might not // we've got at least 4 processors, we'll check the upper end but also 3 and 4 as the upper might not
// be reached if the system is under heavy load. // be reached if the system is under heavy load.
if( ! (file("max-concurrent-tests_3").exists() || file("max-concurrent-tests_4").exists() || if ! (file("max-concurrent-tests_3").exists() || file("max-concurrent-tests_4").exists() ||
file("max-concurrent-tests_" + (nbProc -1)).exists() || file("max-concurrent-tests_" + nbProc).exists())) { file("max-concurrent-tests_" + (nbProc -1)).exists() || file("max-concurrent-tests_" + nbProc).exists()) then
sys.error("Forked tests were not executed in parallel!") sys.error("Forked tests were not executed in parallel!")
} }
}
}
)

13
sbt-app/src/sbt-test/tests/fork-parallel/test
View File

@ -1,8 +1,13 @@
# Note: this test is meaningless on less than four cores # Note: this test is meaningless on less than four cores
> testFull
-> check
> clean
> set testForkedParallel := true
> testFull > testFull
> check > check
> clean
$ delete max-concurrent-tests_1
$ delete max-concurrent-tests_2
$ delete max-concurrent-tests_3
$ delete max-concurrent-tests_4
> set testForkedParallel := false
> testFull
-> check