[Jython-checkins] SF.net SVN: jython:[6890] branches/indy

[<fwi...@us...>]

Revision: 6890
          http://jython.svn.sourceforge.net/jython/?rev=6890&view=rev
Author:   fwierzbicki
Date:     2009-10-23 19:10:19 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
Need to up permgen for regrtest and hardcode indy options in jython shell to
get regrtest to run well.

Modified Paths:
--------------
    branches/indy/build.xml
    branches/indy/src/shell/jython

Modified: branches/indy/build.xml
===================================================================
--- branches/indy/build.xml	2009-10-23 06:01:53 UTC (rev 6889)
+++ branches/indy/build.xml	2009-10-23 19:10:19 UTC (rev 6890)
@@ -910,6 +910,9 @@
     <target name="regrtest" depends="developer-build,regrtest-unix,regrtest-windows"/>
     <target name="regrtest-unix" if="os.family.unix">
       <exec executable="${dist.dir}/bin/jython">
+        <!-- XXX hopefully maxperm won't be necessary once indy matures -->
+        <arg value="-J-XX:MaxPermSize=128M"/>
+
         <arg value="${dist.dir}/Lib/test/regrtest.py"/>
         <!-- Only run the tests that are expected to work on Jython -->
         <arg value="--expected"/>

Modified: branches/indy/src/shell/jython
===================================================================
--- branches/indy/src/shell/jython	2009-10-23 06:01:53 UTC (rev 6889)
+++ branches/indy/src/shell/jython	2009-10-23 19:10:19 UTC (rev 6890)
@@ -244,6 +244,9 @@
   fi
 fi
 
+#XXX Hard code --boot for indy for now.
+boot_requested=true
+
 if [ -n "$profile_requested" -o -z "$boot_requested" ] ; then
   [ -n "$profile_requested" ] && echo "Running with instrumented profiler"
   java_args=("${java_args[@]}" -classpath "$CP$CP_DELIMITER$CLASSPATH")
@@ -259,7 +262,9 @@
   JAVA_CMD=(echo $JAVA_CMD)
 fi
 
-"${JAVA_CMD[@]}" $JAVA_OPTS "${java_args[@]}" -Dpython.home="$JYTHON_HOME" \
+#XXX Hard code indy options for now
+_INDY_OPTS="-XX:+UnlockExperimentalVMOptions -XX:+EnableInvokeDynamic"
+"${JAVA_CMD[@]}" $JAVA_OPTS $_INDY_OPTS "${java_args[@]}" -Dpython.home="$JYTHON_HOME" \
   -Dpython.executable="$PRG" org.python.util.jython $JYTHON_OPTS "$@"
 JYTHON_STATUS=$?
 


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