From 7b05ef591883afcbe56f029b09bec00abbe13032 Mon Sep 17 00:00:00 2001
From: Ethan Atkins <contact@ethanatkins.com>
Date: Sun, 21 Jun 2020 15:46:18 -0700
Subject: [PATCH] Disable supershell in server tests

Also make test build files trigger in watch.
---
 build.sbt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index b1eb26b8f..a70ce498f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1001,6 +1001,7 @@ lazy val serverTestProj = (project in file("server-test"))
     crossScalaVersions := Seq(baseScalaVersion),
     publish / skip := true,
     // make server tests serial
+    Test / watchTriggers += baseDirectory.value.toGlob / "src" / "server-test" / **,
     Test / parallelExecution := false,
     Test / run / connectInput := true,
     Test / run / outputStrategy := Some(StdoutOutput),
@@ -1011,7 +1012,8 @@ lazy val serverTestProj = (project in file("server-test"))
       List(
         s"-Dsbt.server.classpath=$cp",
         s"-Dsbt.server.version=${version.value}",
-        s"-Dsbt.server.scala.version=${scalaVersion.value}"
+        s"-Dsbt.server.scala.version=${scalaVersion.value}",
+        s"-Dsbt.supershell=false",
       )
     },
   )