properly add intergration/test:run dependency on assembly

com-lihaoyi · Mar 27, 2016 · a258932 · a258932
1 parent ae908c8
commit a258932
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/build.sbt b/build.sbt
@@ -192,23 +192,19 @@ lazy val shell = project
     (testOnly in Test) <<= (testOnly in Test).dependsOn(packageBin in Compile)
   )
 
+val integrationTasks = Seq(
+  assembly in repl,
+  packageBin in (shell, Compile)
+)
 lazy val integration = project
   .dependsOn(ops)
   .dependsOn(repl)
   .settings(
     sharedSettings,
-    (test in Test) <<= (test in Test).dependsOn(
-      assembly in repl,
-      packageBin in (shell, Compile)
-    ),
-    (testOnly in Test) <<= (testOnly in Test).dependsOn(
-      assembly in repl,
-      packageBin in (shell, Compile)
-    ),
-    (console in Test) <<= (console in Test).dependsOn(
-      assembly in repl,
-      packageBin in (shell, Compile)
-    ),
+    (test in Test) <<= (test in Test).dependsOn(integrationTasks:_*),
+    (run in Test) <<= (run in Test).dependsOn(integrationTasks:_*),
+    (testOnly in Test) <<= (testOnly in Test).dependsOn(integrationTasks:_*),
+    (console in Test) <<= (console in Test).dependsOn(integrationTasks:_*),
     dontPublishSettings,
     initialCommands in (Test, console) := "ammonite.integration.Main.main(null)"
   )