[Jython-checkins] jython: Fix #2559 Update test_jython_launcher with new Xss value

[jeff.allen]

https://hg.python.org/jython/rev/17e40de9a541
changeset:   8053:17e40de9a541
user:        James Mudd <james.mudd at gmail.com>
date:        Mon Mar 06 22:51:39 2017 +0000
summary:
  Fix #2559 Update test_jython_launcher with new Xss value

Addresses failures in test_marshal on Java 8 caused by Java stack overflow.
Stack now -Xss2560k.

files:
  Lib/test/test_jython_launcher.py |    8 ++++----
  src/shell/jython                 |    6 ++----
  src/shell/jython.exe             |  Bin 
  src/shell/jython.py              |    2 +-
  src/shell/python27.dll           |  Bin 
  5 files changed, 7 insertions(+), 9 deletions(-)


diff --git a/Lib/test/test_jython_launcher.py b/Lib/test/test_jython_launcher.py
--- a/Lib/test/test_jython_launcher.py
+++ b/Lib/test/test_jython_launcher.py
@@ -105,7 +105,7 @@
         args = self.get_cmdline([launcher, "--print"], env)
         self.assertEqual(args[0], os.path.join(my_java, "bin", "java"))
         self.assertEqual(args[1], "-Xmx512m")
-        self.assertEqual(args[2], "-Xss1024k")
+        self.assertEqual(args[2], "-Xss2560k")
         self.assertEqual(args[-1], "org.python.util.jython")
 
     def test_java_opts(self):
@@ -115,7 +115,7 @@
         props = self.get_properties(args)
         self.assertEqual(args[0], "java")
         self.assertEqual(args[1], "-Xmx2g")
-        self.assertEqual(args[2], "-Xss1024k")
+        self.assertEqual(args[2], "-Xss2560k")
         self.assertEqual(args[3], "-classpath", args)
         self.assertEqual(args[4].split(classpath_delimiter())[-1], some_jar)
         self.assertEqual(args[-1], "org.python.util.jython")
@@ -128,7 +128,7 @@
         props = self.get_properties(args)
         self.assertEqual(args[0], "java")
         self.assertEqual(args[1], "-Xmx512m")
-        self.assertEqual(args[2], "-Xss1024k")
+        self.assertEqual(args[2], "-Xss2560k")
         self.assertEqual(args[-1], "org.python.util.jython")
         self.assertIn("python.home", props)
         self.assertIn("python.executable", props)
@@ -159,7 +159,7 @@
         args = self.get_cmdline([launcher, "--print"], env)
         self.assertEqual(args[0], "java")
         self.assertEqual(args[1], "-Xmx512m")
-        self.assertEqual(args[2], "-Xss1024k")
+        self.assertEqual(args[2], "-Xss2560k")
         self.assertEqual(args[-3], "org.python.util.jython")
         self.assertEqual(args[-2], "-c")
         self.assertEqual(args[-1], "print 47")
diff --git a/src/shell/jython b/src/shell/jython
--- a/src/shell/jython
+++ b/src/shell/jython
@@ -109,10 +109,8 @@
 fi
 
 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
+   # test_marshal.py needs a Xss of 2560k to pass
+  JAVA_STACK=-Xss2560k
 fi
 
 JAVA_ENCODING=""
diff --git a/src/shell/jython.exe b/src/shell/jython.exe
index 2a03827dd99c8d2d908074a2e3de15abf56e30d2..7c9cbe9eec239c5768c17f873726220b09966341
GIT binary patch
[stripped]
diff --git a/src/shell/jython.py b/src/shell/jython.py
--- a/src/shell/jython.py
+++ b/src/shell/jython.py
@@ -208,7 +208,7 @@
         if hasattr(self.args, "stack"):
             return self.args.stack
         else:
-            return os.environ.get("JAVA_STACK", "-Xss1024k")
+            return os.environ.get("JAVA_STACK", "-Xss2560k")
 
     @property
     def java_opts(self):
diff --git a/src/shell/python27.dll b/src/shell/python27.dll
index 8d99ae24798acc720af4dca97140e0f591f39eb7..f62238f1826f1c1230c0db7938c1133e1ca5ae5d
GIT binary patch
[stripped]

-- 
Repository URL: https://hg.python.org/jython