From cf73bbbafc06a83d3f84124052deb962f71d4e74 Mon Sep 17 00:00:00 2001
From: Ethan Atkins <ethan.atkins@gmail.com>
Date: Thu, 30 May 2019 16:39:00 -0700
Subject: [PATCH] Fix ScalaLibrary again

I was benchmarking sbt with turbo mode on and found that tests weren't
running. This was because we were inadvertently excluding all of the
dependency jars from the dynamic classpath. I have no idea why the
scripted tests didn't catch this.

The scalatest scripted test didn't catch this because 'test' just
automaticaly succeeds if no test frameworks are found. To guard against
regression, I had to ensure that 'test' failed for every strategy if a
bad test file was present.
---
 main/src/main/scala/sbt/internal/ClassLoaders.scala  |  6 ++++--
 .../sbt-test/classloader-cache/package-private/test  |  2 ++
 sbt/src/sbt-test/classloader-cache/scalatest/test    | 12 ++++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/main/src/main/scala/sbt/internal/ClassLoaders.scala b/main/src/main/scala/sbt/internal/ClassLoaders.scala
index 37ace0f72..3b4c607fc 100644
--- a/main/src/main/scala/sbt/internal/ClassLoaders.scala
+++ b/main/src/main/scala/sbt/internal/ClassLoaders.scala
@@ -132,7 +132,6 @@ private[sbt] object ClassLoaders {
           case _: AllLibraryJars => true
           case _                 => false
         }
-        val allDependenciesSet = allDependencies.toSet
         val scalaLibraryLayer = layer(si.libraryJars, interfaceLoader, cache, resources, tmp)
         val cpFiles = fullCP.map(_._1)
 
@@ -148,7 +147,10 @@ private[sbt] object ClassLoaders {
           else resourceLayer
 
         // layer 4
-        val dynamicClasspath = cpFiles.filterNot(allDependenciesSet ++ si.libraryJars)
+        val filteredSet =
+          if (layerDependencies) allDependencies.toSet ++ si.libraryJars
+          else Set(si.libraryJars: _*)
+        val dynamicClasspath = cpFiles.filterNot(filteredSet)
         new LayeredClassLoader(dynamicClasspath, dependencyLayer, resources, tmp)
     }
     ClasspathUtilities.filterByClasspath(cpFiles, raw)
diff --git a/sbt/src/sbt-test/classloader-cache/package-private/test b/sbt/src/sbt-test/classloader-cache/package-private/test
index 64ef9d785..dd298596e 100644
--- a/sbt/src/sbt-test/classloader-cache/package-private/test
+++ b/sbt/src/sbt-test/classloader-cache/package-private/test
@@ -1,3 +1,5 @@
+> set Compile / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.AllLibraryJars
+
 -> run
 
 > set Compile / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat
diff --git a/sbt/src/sbt-test/classloader-cache/scalatest/test b/sbt/src/sbt-test/classloader-cache/scalatest/test
index 9b34bf4a6..055516751 100644
--- a/sbt/src/sbt-test/classloader-cache/scalatest/test
+++ b/sbt/src/sbt-test/classloader-cache/scalatest/test
@@ -1,3 +1,5 @@
+> set Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.AllLibraryJars
+
 > test
 
 > set Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat
@@ -8,8 +10,14 @@
 
 > test
 
-> set Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.AllLibraryJars
-
 $ copy-file changes/bad.scala src/test/scala/sbt/ScalatestTest.scala
 
 -> test
+
+> set Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat
+
+-> test
+
+> set Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.AllLibraryJars
+
+-> test