Merge pull request scala#6377 from retronym/topic/workaround-sbt-test-race

adriaanm · web-flow · commit 655b659bd169 · 2018-03-06T23:23:33.000+01:00
Disable parallelism in the scalacheck suite
diff --git a/build.sbt b/build.sbt
@@ -598,6 +598,9 @@ lazy val scalacheck = project.in(file("test") / "scalacheck")
     libraryDependencies ++= Seq(scalacheckDep),
     unmanagedSourceDirectories in Compile := Nil,
     unmanagedSourceDirectories in Test := List(baseDirectory.value)
+  ).settings(
+    // Workaround for https://github.com/sbt/sbt/pull/3985
+    List(Keys.test, Keys.testOnly).map(task => parallelExecution in task := false) : _*
   )
 
 lazy val osgiTestFelix = osgiTestProject(

Original file line number	Diff line number	Diff line change
`@@ -598,6 +598,9 @@ lazy val scalacheck = project.in(file("test") / "scalacheck")`
`598`	`598`	`libraryDependencies ++= Seq(scalacheckDep),`
`599`	`599`	`unmanagedSourceDirectories in Compile := Nil,`
`600`	`600`	`unmanagedSourceDirectories in Test := List(baseDirectory.value)`
	`601`	`+ ).settings(`
	`602`	`+ // Workaround for https://github.com/sbt/sbt/pull/3985`
	`603`	`+ List(Keys.test, Keys.testOnly).map(task => parallelExecution in task := false) : _*`
`601`	`604`	`)`
`602`	`605`
`603`	`606`	`lazy val osgiTestFelix = osgiTestProject(`