Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed bloop tests on windows #1331

Merged
merged 1 commit into from
May 21, 2021
Merged

Fixed bloop tests on windows #1331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ object BloopTests extends TestSuite {
}

object scalanativeModule extends scalanativelib.ScalaNativeModule with testBloop.Module {
override def skipBloop: Boolean = scala.util.Properties.isWin
override def scalaVersion = "2.13.4"
override def scalaNativeVersion = "0.4.0"
override def releaseMode = T(ReleaseMode.Debug)
Expand All @@ -76,7 +77,8 @@ object BloopTests extends TestSuite {
val scalaModule2Config = readBloopConf("scalaModule2.json")
val testModuleConfig = readBloopConf("scalaModule.test.json")
val scalajsModuleConfig = readBloopConf("scalajsModule.json")
val scalanativeModuleConfig = readBloopConf("scalanativeModule.json")
// skipped on Windows
val scalanativeModuleConfig = if(scala.util.Properties.isWin) None else Some(readBloopConf("scalanativeModule.json"))

'scalaModule - {
val p = scalaModuleConfig.project
Expand Down Expand Up @@ -149,21 +151,27 @@ object BloopTests extends TestSuite {
assert(platform.config.mode == BloopConfig.LinkerMode.Release)
}
'scalanativeModule - {
val p = scalanativeModuleConfig.project
val name = p.name
val workspaceDir = p.workspaceDir
val sources = p.sources.map(Path(_))
val version = p.scala.get.version
val platform = p.platform.get.asInstanceOf[BloopConfig.Platform.Native]

val (clang, _) = testEvaluator(build.scalanativeModule.nativeClang).asSuccess.get.value.right.get

assert(name == "scalanativeModule")
assert(workspaceDir == Some(workdir.wrapped))
assert(sources == List(workdir / "scalanativeModule" / "src"))
assert(version == "2.13.4")
assert(platform.config.mode == BloopConfig.LinkerMode.Debug)
assert(platform.config.clang == clang.toNIO)
scalanativeModuleConfig match {
case None =>
val exists = os.exists(workdir / ".bloop" / "scalanativeModule.json")
assert(exists == false)
case Some(scalanativeModuleConfig) =>
val p = scalanativeModuleConfig.project
val name = p.name
val workspaceDir = p.workspaceDir
val sources = p.sources.map(Path(_))
val version = p.scala.get.version
val platform = p.platform.get.asInstanceOf[BloopConfig.Platform.Native]

val (clang, _) = testEvaluator(build.scalanativeModule.nativeClang).asSuccess.get.value.right.get

assert(name == "scalanativeModule")
assert(workspaceDir == Some(workdir.wrapped))
assert(sources == List(workdir / "scalanativeModule" / "src"))
assert(version == "2.13.4")
assert(platform.config.mode == BloopConfig.LinkerMode.Debug)
assert(platform.config.clang == clang.toNIO)
}
}
'skipped - {
val exists = os.exists(workdir / ".bloop" / "skippedModule.json")
Expand Down