jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 6 +++--- solenv/gbuild/PythonTest.mk | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-)
New commits: commit a9833ee9c27fef2f34ce1061ebfdf44d525c35ca 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 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 bb6399937270fb149639248dd1a28775948f7285 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 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 36d6a33..893066c 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -67,7 +67,7 @@ #endif #endif -#if defined LINUX && defined X86 +#if defined LINUX && (defined X86 || defined X86_64) #include <sys/resource.h> #endif @@ -755,7 +755,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 commit 004ddbe666121f0bbf42cd256ba89377c633427e Author: Michael Stahl <[email protected]> Date: Wed Jun 24 13:07:30 2015 +0200 jvmfwk: slighly misleading error message Change-Id: I64165a03c16d852781173fe2de952e6b803efaf7 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 518a1a9..36d6a33 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -194,7 +194,7 @@ extern "C" void JNICALL abort_handler() // If we are within JNI_CreateJavaVM then we jump back into getJavaVM if( g_bInGetJavaVM != 0 ) { - fprintf( stderr, "JavaVM: JNI_CreateJavaVM called _exit, caught by abort_handler in javavm.cxx\n"); + fprintf(stderr, "JavaVM: JNI_CreateJavaVM called os::abort(), caught by abort_handler in javavm.cxx\n"); longjmp( jmp_jvm_abort, 0); } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
