.

com-lihaoyi · Jun 1, 2023 · 9879a0c · 9879a0c
1 parent 6d05c4d
commit 9879a0c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/build.sc b/build.sc
@@ -616,7 +616,8 @@ object contrib extends Module {
   object testng extends JavaModule with ContribModule {
 
     def testTransitiveDeps =
-      super.testTransitiveDeps() ++ Seq(scalalib.testDep(), scalalib.worker.testDep())
+      super.testTransitiveDeps() ++
+      Seq(scalalib.testDep(), scalalib.worker.testDep(), testrunner.entrypoint.testDep())
 
     // pure Java implementation
     def artifactSuffix: T[String] = ""
@@ -906,6 +907,8 @@ trait IntegrationTestCrossModule extends IntegrationTestModule with Cross.Module
   def millSourcePath = super.millSourcePath / repoSlug
 
   object local extends ModeModule
+  object fork extends ModeModule
+  object server extends ModeModule
 }
 
 def listIn(path: os.Path) = interp.watchValue(os.list(path).map(_.last))
@@ -1030,10 +1033,7 @@ object example extends MillScalaModule {
 object integration extends MillScalaModule {
   object failure extends Cross[IntegrationCrossModule](listIn(millSourcePath / "failure"))
   object feature extends Cross[IntegrationCrossModule](listIn(millSourcePath / "feature"))
-  trait IntegrationCrossModule extends IntegrationTestCrossModule{
-    object fork extends ModeModule
-    object server extends ModeModule
-  }
+  trait IntegrationCrossModule extends IntegrationTestCrossModule
 
   def moduleDeps = Seq(scalalib, scalajslib, scalanativelib, runner.test)
 

diff --git a/example/thirdparty/acyclic/build.sc b/example/thirdparty/acyclic/build.sc
@@ -68,7 +68,7 @@ acyclic[2.13.9].compile
 compiling 6 Scala sources...
 ...
 
-> ./mill acyclic[2.13.10].test
+> ./mill acyclic[2.13.10].test.testLocal # acyclic tests need testLocal due to classloader assumptions
 -------------------------------- Running Tests --------------------------------
 ...