diff options
| author | Paul Phillips <paulp@improving.org> | 2011-07-27 20:59:13 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-07-27 20:59:13 +0000 |
| commit | 6b096309778039f75d450acec3d02c3a0fa005f3 (patch) | |
| tree | 44bea86c243cb2e7fb67e682110791d876d07f64 | |
| parent | 401baad565218da34558318ebd1f65edb31b39c8 (diff) | |
| download | scala-6b096309778039f75d450acec3d02c3a0fa005f3.tar.gz scala-6b096309778039f75d450acec3d02c3a0fa005f3.tar.bz2 scala-6b096309778039f75d450acec3d02c3a0fa005f3.zip | |
"Freed the lisp test." Tweaked partest defaults...
"Freed the lisp test." Tweaked partest defaults a little in the hopes
that seth tisue is correct in his analysis. No review.
| -rw-r--r-- | src/partest/scala/tools/partest/PartestDefaults.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/DirectRunner.scala | 2 | ||||
| -rw-r--r-- | test/files/run/lisp.check (renamed from test/disabled/run/lisp.check) | 0 | ||||
| -rw-r--r-- | test/files/run/lisp.scala (renamed from test/disabled/run/lisp.scala) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/src/partest/scala/tools/partest/PartestDefaults.scala b/src/partest/scala/tools/partest/PartestDefaults.scala index a113c2b8ff..7548b3ef3b 100644 --- a/src/partest/scala/tools/partest/PartestDefaults.scala +++ b/src/partest/scala/tools/partest/PartestDefaults.scala @@ -23,7 +23,7 @@ object PartestDefaults { def testBuild = propOrNone("partest.build") def errorCount = propOrElse("partest.errors", "0").toInt - def numActors = propOrElse("partest.actors", "8").toInt + def numActors = propOrElse("partest.actors", "6").toInt def poolSize = wrapAccessControl(propOrNone("actors.corePoolSize")) def timeout = "1200000" diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala index 7257f02c0b..757f9bda1a 100644 --- a/src/partest/scala/tools/partest/nest/DirectRunner.scala +++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala @@ -46,7 +46,7 @@ trait DirectRunner { if (PartestDefaults.poolSize.isEmpty) { scala.actors.Debug.info("actors.corePoolSize not defined") - setProp("actors.corePoolSize", "16") + setProp("actors.corePoolSize", "12") } } diff --git a/test/disabled/run/lisp.check b/test/files/run/lisp.check index 64053f26d0..64053f26d0 100644 --- a/test/disabled/run/lisp.check +++ b/test/files/run/lisp.check diff --git a/test/disabled/run/lisp.scala b/test/files/run/lisp.scala index f3687ea1bb..f3687ea1bb 100644 --- a/test/disabled/run/lisp.scala +++ b/test/files/run/lisp.scala |