jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 4 ++-- solenv/gbuild/PythonTest.mk | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit 54e470685337c8c231b80ca9e95c11f9babf25c7 Author: Michael Stahl <[email protected]> Date: Wed Jun 24 14:25:11 2015 +0200 gbuild: PythonTest: run tests with --headless The python tests currently use the default desktop-dependent vclplug, but should use svp like every other test. Apparently there's no way to pass command line parameters through python, so set SAL_USE_VCLPLUGIN=svp. Change-Id: Idb9afd87a1721c5188aeecd9b1f83521f6431757 (cherry picked from commit a9833ee9c27fef2f34ce1061ebfdf44d525c35ca) diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index ce5f5ed..561ea64 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -52,7 +52,11 @@ $(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS) UserInstallation=$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*))user) \ TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \ PYTHONDONTWRITEBYTECODE=1 \ - $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_PythonTest_COMMAND) \ + $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ + SAL_USE_VCLPLUGIN=svp \ + )) \ + $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) \ + $(gb_PythonTest_COMMAND) \ $(MODULES) \ $(if $(gb_CppunitTest__interactive),, \ > [email protected] 2>&1 \ commit 8189c4c8bd94394dd603c2eac1c85b6fd2d2259a Author: Michael Stahl <[email protected]> Date: Wed Jun 24 13:35:48 2015 +0200 jvmfwk: pass along -Xss to JVM on AMD64 too The PythonTest_dbacces_python in a clang ASAN build on F21 started to fail with StackOverflowError in JNI_CreateJavaVM on the main thread, and this fixes the problem. Seen with java-1.8.0-openjdk-1.8.0.45-39.b14.fc21.x86_64 Change-Id: I87dfb4b62d547b334c19261aad88b4856489776f (cherry picked from commit bb6399937270fb149639248dd1a28775948f7285) diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 18c7280..72e17d3 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -70,7 +70,7 @@ #endif #endif -#if defined LINUX && defined X86 +#if defined LINUX && (defined X86 || defined X86_64) #include <sys/resource.h> #endif @@ -758,7 +758,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( options.push_back(Option("-Xint", nullptr)); } if (!hasStackSize) { -#if defined LINUX && defined X86 +#if defined LINUX && (defined X86 || defined X86_64) // At least OpenJDK 1.8.0's os::workaround_expand_exec_shield_cs_limit // (hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp) can mmap an rwx // page into the area that the main stack can grow down to according to _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
