From 4ce496401b8e2c999bb69593ad31bc39ea2bfd0c Mon Sep 17 00:00:00 2001 From: phaller Date: Mon, 29 Oct 2012 14:40:12 +0100 Subject: Tweak build and test scripts --- build.sh | 4 ---- src/async/test/async-spec/AsyncSpec.scala | 4 ++-- test.sh | 4 ++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index c9c06f4..887d52c 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,3 @@ #!/bin/bash mkdir -p classes scalac -d classes -deprecation -feature src/async/library/scala/async/Async.scala src/async/library/scala/async/AsyncUtils.scala -mkdir -p test-classes -#scalac -cp classes -d test-classes src/async/test/async-spec/Example.scala -scalac -cp classes -d test-classes src/async/test/async-spec/MinimalScalaTest.scala -scalac -cp classes:test-classes -d test-classes src/async/test/async-spec/AsyncSpec.scala diff --git a/src/async/test/async-spec/AsyncSpec.scala b/src/async/test/async-spec/AsyncSpec.scala index a537029..afd4c6c 100644 --- a/src/async/test/async-spec/AsyncSpec.scala +++ b/src/async/test/async-spec/AsyncSpec.scala @@ -20,7 +20,7 @@ class Test1Class { import ExecutionContext.Implicits.global def m1(x: Int): Future[Int] = future { - Thread.sleep(2000) + Thread.sleep(1000) x + 2 } @@ -67,7 +67,7 @@ object AsyncSpec extends MinimalScalaTest { "support several awaits in sequence" in { val o = new Test1Class val fut = o.m3(10) - val res = Await.result(fut, 10 seconds) + val res = Await.result(fut, 4 seconds) res mustBe(26) } } diff --git a/test.sh b/test.sh index a473c17..e021b8e 100755 --- a/test.sh +++ b/test.sh @@ -1,2 +1,6 @@ #!/bin/bash +mkdir -p test-classes +#scalac -cp classes -d test-classes src/async/test/async-spec/Example.scala +scalac -cp classes -d test-classes src/async/test/async-spec/MinimalScalaTest.scala +scalac -Xprint:typer -cp classes:test-classes -d test-classes src/async/test/async-spec/AsyncSpec.scala scala -cp test-classes scala.async.Test -- cgit v1.2.3