From ba5ac774dfa8f63a73ec58ece58ab177a6baea45 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Mon, 26 Aug 2024 10:43:15 +0200 Subject: [PATCH] Test custom class directory --- .../src/server-test/buildserver/build.sbt | 4 +++- .../test/scala/testpkg/BuildServerTest.scala | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/server-test/src/server-test/buildserver/build.sbt b/server-test/src/server-test/buildserver/build.sbt index a8eb0d910..5ce45cc78 100644 --- a/server-test/src/server-test/buildserver/build.sbt +++ b/server-test/src/server-test/buildserver/build.sbt @@ -31,7 +31,9 @@ lazy val respondError = project.in(file("respond-error")) } ) -lazy val util = project +lazy val util = project.settings( + Compile / classDirectory := baseDirectory.value / "classes" +) lazy val diagnostics = project diff --git a/server-test/src/test/scala/testpkg/BuildServerTest.scala b/server-test/src/test/scala/testpkg/BuildServerTest.scala index 317fd350d..456dbdcba 100644 --- a/server-test/src/test/scala/testpkg/BuildServerTest.scala +++ b/server-test/src/test/scala/testpkg/BuildServerTest.scala @@ -255,16 +255,21 @@ class BuildServerTest extends AbstractServerTest { buildTargetUri("badBuildTarget", "Compile"), ) + val classDirectoryUri = new File(svr.baseDirectory, "util/classes").toURI + println(s""""classDirectory":"$classDirectoryUri"""") val id1 = scalacOptions(buildTargets) - assertMessage(s""""id":"$id1"""", "scala-library-2.13.11.jar")() + assertMessage( + s""""id":"$id1"""", + "scala-library-2.13.11.jar", + s""""classDirectory":"$classDirectoryUri"""" + )() val id2 = javacOptions(buildTargets) - assertMessage(s""""id":"$id2"""", "scala-library-2.13.11.jar")() - - val id3 = scalacOptions(Seq(buildTargetUri("runAndTest", "Compile"))) - assertMessage(s""""id":"$id3"""", "target/out/jvm/scala-2.13.11/runandtest/classes")(debug = - true - ) + assertMessage( + s""""id":"$id2"""", + "scala-library-2.13.11.jar", + s""""classDirectory":"$classDirectoryUri"""" + )() } test("buildTarget/cleanCache") {