Skip to content

Commit 3524e27

Browse files
authored
Merge pull request scala#10802 from som-snytt/test/sbt-test
One-only parallel instance for sbt-test
2 parents 1c3d291 + afc1e04 commit 3524e27

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ lazy val sbtTest = project.in(file("test") / "sbt-test")
960960
sbtTestDirectory := baseDirectory.value,
961961

962962
scriptedBatchExecution := true, // set to `false` to execute each test in a separate sbt instance
963-
scriptedParallelInstances := 2, // default is 1
963+
scriptedParallelInstances := (if (insideCI.value) 1 else 2), // default is 1; races cause spurious failures
964964

965965
// hide sbt output of scripted tests
966966
scriptedBufferLog := true,

0 commit comments

Comments
 (0)