From e10107e4a5386f29e09630a9f22c48b321bac8a3 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Thu, 20 Apr 2017 18:20:08 -0500 Subject: [PATCH 1/2] Add test from https://github.com/rickynils/scalacheck/issues/290 --- tests/run/deadlock.scala | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 tests/run/deadlock.scala diff --git a/tests/run/deadlock.scala b/tests/run/deadlock.scala new file mode 100644 index 000000000000..2cc1d883e3ed --- /dev/null +++ b/tests/run/deadlock.scala @@ -0,0 +1,11 @@ +// from https://github.com/rickynils/scalacheck/issues/290 +import scala.concurrent._ +import scala.concurrent.duration._ +import java.util.concurrent.Executors + +object Test { + import ExecutionContext.Implicits.global + val x = Await.result(Future(1), 1000.seconds) + def main(args: Array[String]) = println(x) +} + From bcb73f9858c0024b4044c6c42beebeda170a65eb Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Thu, 20 Apr 2017 18:33:52 -0500 Subject: [PATCH 2/2] Add forgotten check-file. --- tests/run/deadlock.check | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/run/deadlock.check diff --git a/tests/run/deadlock.check b/tests/run/deadlock.check new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/tests/run/deadlock.check @@ -0,0 +1 @@ +1