summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-07-18 08:00:13 +0000
committerPaul Phillips <paulp@improving.org>2011-07-18 08:00:13 +0000
commita0f1c4c4f7b4d0dedb0594a498b98a8c15a9151c (patch)
tree42c9374be9b07e2d9407d5b2f3bfed14fec30616
parent88710b419a192fd0c22c834e191eb5012b58638b (diff)
downloadscala-a0f1c4c4f7b4d0dedb0594a498b98a8c15a9151c.tar.gz
scala-a0f1c4c4f7b4d0dedb0594a498b98a8c15a9151c.tar.bz2
scala-a0f1c4c4f7b4d0dedb0594a498b98a8c15a9151c.zip
Workaround for scalacheck calling System.exit d...
Workaround for scalacheck calling System.exit during testing. Not sure exactly what the sequence of events is here: I found the exit problem months ago and committed code to scalacheck to make that configurable, and then didn't see it again until recently, but I don't think it was ever addressed. This is just a bandaid. No review.
-rw-r--r--src/scalacheck/org/scalacheck/Prop.scala2
-rw-r--r--test/files/lib/scalacheck.jar.desired.sha12
2 files changed, 2 insertions, 2 deletions
diff --git a/src/scalacheck/org/scalacheck/Prop.scala b/src/scalacheck/org/scalacheck/Prop.scala
index c8b19097d2..3ae9f22234 100644
--- a/src/scalacheck/org/scalacheck/Prop.scala
+++ b/src/scalacheck/org/scalacheck/Prop.scala
@@ -59,7 +59,7 @@ trait Prop {
/** Whether main should call System.exit with an exit code.
* Defaults to true; override to change.
*/
- def mainCallsExit = true
+ def mainCallsExit = false
/** Convenience method that makes it possible to use this property
* as an application that checks itself on execution */
diff --git a/test/files/lib/scalacheck.jar.desired.sha1 b/test/files/lib/scalacheck.jar.desired.sha1
index 873fe0da38..b104f58897 100644
--- a/test/files/lib/scalacheck.jar.desired.sha1
+++ b/test/files/lib/scalacheck.jar.desired.sha1
@@ -1 +1 @@
-0b024f86ffcb0c7841399e8af642f9aeba42508f ?scalacheck.jar
+2a3e19c3d8d93be661e66f941f19e7d49c667c2b ?scalacheck.jar