Update Makefile, build.sbt to support subproject coverage (#659)

2 files changed, 3 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 5aba65ac..9cf211f2 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ checkstyle:
 
 coverage:
 	$(SBT) $(SBT_FLAGS) coverage test
-	$(SBT) $(SBT_FLAGS) coverageReport
+	$(SBT) $(SBT_FLAGS) coverageReport coverageAggregate
 
 clean:
 	$(SBT) $(SBT_FLAGS) clean
diff --git a/build.sbt b/build.sbt
index d1b3eb79..9c909399 100644
--- a/build.sbt
+++ b/build.sbt
@@ -119,6 +119,8 @@ lazy val chisel = (project in file(".")).
   // Prevent separate JARs from being generated for coreMacros and chiselFrontend.
   dependsOn(coreMacros % "compile-internal;test-internal").
   dependsOn(chiselFrontend % "compile-internal;test-internal").
+  // The following is required until sbt-scoverage correctly deals with inDependencies
+  aggregate(coreMacros, chiselFrontend).
   settings(
     scalacOptions in Test ++= Seq("-language:reflectiveCalls"),
     scalacOptions in Compile in doc ++= Seq(