diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-03-18 10:03:12 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-03-18 10:03:12 -0700 |
commit | 350a3115afca590bee6311dbed4a657fe9cca375 (patch) | |
tree | 1a94f063491826eef5487e283e133d4e5e48ff16 /scalajslib/jsbridges/1.0 | |
parent | d759fea899b1889d64bacdcee6a4fdd9dd8f1417 (diff) | |
download | mill-350a3115afca590bee6311dbed4a657fe9cca375.tar.gz mill-350a3115afca590bee6311dbed4a657fe9cca375.tar.bz2 mill-350a3115afca590bee6311dbed4a657fe9cca375.zip |
Properly close Scala.js test adapters when done, after letting the IO drain properly
Diffstat (limited to 'scalajslib/jsbridges/1.0')
-rw-r--r-- | scalajslib/jsbridges/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/scalajslib/jsbridges/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala b/scalajslib/jsbridges/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala index d7ed26eb..53986f1b 100644 --- a/scalajslib/jsbridges/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala +++ b/scalajslib/jsbridges/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala @@ -37,18 +37,21 @@ class ScalaJSBridge extends mill.scalajslib.ScalaJSBridge { def getFramework(config: NodeJSConfig, frameworkName: String, - linkedFile: File): sbt.testing.Framework = { + linkedFile: File): (() => Unit, sbt.testing.Framework) = { val env = nodeJSEnv(config) val tconfig = TestAdapter.Config().withLogger(new ScalaConsoleLogger) val adapter = new TestAdapter(env, Seq(FileVirtualJSFile(linkedFile)), tconfig) - adapter - .loadFrameworks(List(List(frameworkName))) - .flatten - .headOption - .getOrElse(throw new RuntimeException("Failed to get framework")) + ( + () => adapter.close(), + adapter + .loadFrameworks(List(List(frameworkName))) + .flatten + .headOption + .getOrElse(throw new RuntimeException("Failed to get framework")) + ) } def nodeJSEnv(config: NodeJSConfig): NodeJSEnv = { |