From 0da788c52121e44de6be0cdc7a0c4c6e1b125ff9 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Tue, 25 Oct 2016 17:01:53 +0200
Subject: Add bin project to separate scripted tests from compiler tests

---
 project/Build.scala | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'project/Build.scala')

diff --git a/project/Build.scala b/project/Build.scala
index e650325d4..e7fab03eb 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -216,33 +216,44 @@ object DottyBuild extends Build {
         ";dotty-interfaces/package" +
         ";dotty-compiler/package" +
         ";dotty-library/package" +
-        ";test:package"
+        ";dotty-compiler/test:package"
       ) ++
       addCommandAlias(
         "partest",
         ";packageAll" +
         ";test:runMain dotc.build" +
         ";lockPartestFile" +
-        ";test:test" +
-        ";runPartestRunner"
+        ";dotty-compiler/test:test" +
+        ";runPartestRunner" +
+        ";bin/test" // script tests need to run after the unit tests
       ) ++
-      addCommandAlias("partest-only",
+      addCommandAlias(
+        "partest-only",
         ";packageAll" +
         ";test:runMain dotc.build" +
         ";lockPartestFile" +
-        ";test:test-only dotc.tests" +
+        ";dotty-compiler/test:test-only dotc.tests" +
         ";runPartestRunner"
       ) ++
       addCommandAlias(
         "partest-only-no-bootstrap",
         ";packageAll" +
         ";lockPartestFile" +
-        ";test:test-only dotc.tests" +
+        ";dotty-compiler/test:test-only dotc.tests" +
         ";runPartestRunner"
       )
     ).
     settings(publishing)
 
+  /* Contains unit tests for the scripts */
+  lazy val bin = project.in(file("bin")).
+    settings(sourceStructure).
+    settings(
+      parallelExecution in Test := false,
+      libraryDependencies +=
+        "com.novocode" % "junit-interface" % "0.11" % "test"
+    )
+
   lazy val `dotty-library` = project.in(file("library")).
     settings(sourceStructure).
     settings(
-- 
cgit v1.2.3