luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix BuildServerTest

This commit is contained in:
Adrien Piquerez 2024-03-21 15:07:29 +01:00
parent d02696e886
commit 62f077e657
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server-test/src/test/scala/testpkg/BuildServerTest.scala
View File

@ -84,7 +84,7 @@ class BuildServerTest extends AbstractServerTest {
"project/A.scala",
"project/src/main/java",
"project/src/main/scala-3",
s"project/src/main/scala-sbt-${sbtVersion}",
s"project/src/main/scala-sbt-${TestProperties.version}",
"project/src/main/scala/",
"target/out/jvm/scala-3.3.1/buildserver-build/src_managed/main"
).map(rel => new File(svr.baseDirectory.getAbsoluteFile, rel).toURI).sorted

4
server-test/src/test/scala/testpkg/TestServer.scala
View File

@ -32,10 +32,6 @@ trait AbstractServerTest extends AnyFunSuite with BeforeAndAfterAll {
def testDirectory: String
def testPath: Path = temp.toPath.resolve(testDirectory)
def sbtVersion = sys.props
.get("sbt.server.version")
.getOrElse(throw new IllegalStateException("No server version was specified."))
private val targetDir: File = {
val p0 = new File("..").getAbsoluteFile.getCanonicalFile / "target"
val p1 = new File("target").getAbsoluteFile