[Jython-checkins] SF.net SVN: jython:[5485] trunk/jython

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

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

Log Message:
-----------
o delete references to test.test_ modules in the test package after running
them to conserve memory
o bump ant regrtest's heap to 144m which is about the minimum needed for
Apple's 64 bit Java 6 (server VM)

Modified Paths:
--------------
    trunk/jython/Lib/test/regrtest.py
    trunk/jython/build.xml

Modified: trunk/jython/Lib/test/regrtest.py
===================================================================
--- trunk/jython/Lib/test/regrtest.py	2008-10-20 20:05:02 UTC (rev 5484)
+++ trunk/jython/Lib/test/regrtest.py	2008-10-20 21:18:08 UTC (rev 5485)
@@ -168,6 +168,7 @@
         newsoft = min(hard, max(soft, 1024*2048))
         resource.setrlimit(resource.RLIMIT_STACK, (newsoft, hard))
 
+import test as _test
 from test import test_support
 
 RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', 'bsddb',
@@ -416,6 +417,9 @@
         for module in sys.modules.keys():
             if module not in save_modules and module.startswith("test."):
                 test_support.unload(module)
+                module = module[5:]
+                if hasattr(_test, module):
+                    delattr(_test, module)
 
     # The lists won't be sorted if running with -r
     good.sort()

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2008-10-20 20:05:02 UTC (rev 5484)
+++ trunk/jython/build.xml	2008-10-20 21:18:08 UTC (rev 5485)
@@ -171,7 +171,9 @@
             <pathelement path="${exposed.dir}" />
             <pathelement path="${compile.dir}" />
         </path>
-        <property name="regrtest.Xmx" value="-Xmx96m" />
+        <!-- 64 bit Java 6 needs about 96m for regrtest on most platforms, but Apple's needs
+         144m -->
+        <property name="regrtest.Xmx" value="-Xmx144m" />
     </target>
 
     <target name="version-init">


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