Add missing junit-async adaption for using Await.result

scala-native · Feb 7, 2023 · 2a71cff · 2a71cff
1 parent baadd57
commit 2a71cff
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/junit-async/native/src/main/scala/scala/scalanative/junit/async/package.scala b/junit-async/native/src/main/scala/scala/scalanative/junit/async/package.scala
@@ -1,11 +1,17 @@
 package scala.scalanative.junit
 
-import scala.concurrent.Future
+import scala.concurrent.{Await, Future}
+import scala.concurrent.duration.Duration
+import scala.scalanative.meta.LinktimeInfo.isMultithreadingEnabled
 
 package object async {
   type AsyncResult = Unit
   def await(future: Future[_]): AsyncResult = {
-    scala.scalanative.runtime.loop()
-    future.value.get.get
+    if (isMultithreadingEnabled)
+      Await.result(future, Duration.Inf)
+    else {
+      scala.scalanative.runtime.loop()
+      future.value.get.get
+    }
   }
 }