[Jython-checkins] SF.net SVN: jython:[5484] trunk/jython/src/shell/jython

[<pj...@us...>]

Revision: 5484
          http://jython.svn.sourceforge.net/jython/?rev=5484&view=rev
Author:   pjenvey
Date:     2008-10-20 20:05:02 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
revert r5474 and bump Java's stack size to 1024k, matching 64 bit Java's
default. 32 bit needs an increase to at least 512k to pass test_cpickle, but we
don't want to shrink 64 bit's default

Modified Paths:
--------------
    trunk/jython/src/shell/jython

Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython	2008-10-20 20:01:14 UTC (rev 5483)
+++ trunk/jython/src/shell/jython	2008-10-20 20:05:02 UTC (rev 5484)
@@ -13,12 +13,10 @@
 # -----------------------------------------------------------------------------
 
 cygwin=false
-solaris=false
 
 # ----- Identify OS we are running under --------------------------------------
 case "`uname`" in
-  CYGWIN*) cygwin=true;;
-  SunOS*) solaris=true;;
+  CYGWIN*) cygwin=true
 esac
 
 # ----- Verify and set required environment variables -------------------------
@@ -83,12 +81,11 @@
 
 # ----- Execute the requested command -----------------------------------------
 
-# stack size value determined by the minimum requirement for
-# test_cpickle
-if $solaris; then
-  JAVA_STACK=-Xss768k
-else
-  JAVA_STACK=-Xss512k
+if [ -z "$JAVA_STACK" ]; then
+   # 32 bit Java 6 needs the stack increased to at least 512k for
+   # test_cpickle to pass, but we don't want to shrink 64 bit Java's
+   # default of 1024k
+  JAVA_STACK=-Xss1024k
 fi
 
 # Split out any -J argument for passing to the JVM.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.