[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/CppunitTest.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 28c11aaf7cca690db1726771208837c437d715b3
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Feb 6 16:40:11 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Feb 6 19:37:19 2020 +0100

    Missing test dependency
    
    ...for CppunitTest that use Java, like CppunitTest_dbaccess_hsqldb_test failing
    with something like
    
    > warn:jfw:2880195:2880195:jvmfwk/source/fwkbase.cxx:94: [Java framework] A vendor settings file was not specified.Check the bootstrap parameter UNO_JAVA_JFW_VENDOR_SETTINGS.
    > warn:jfw:2880195:2880195:jvmfwk/source/framework.cxx:582: [Java framework] A vendor settings file was not specified.Check the bootstrap parameter UNO_JAVA_JFW_VENDOR_SETTINGS.
    
    because the jvmfwk3 ini file is missing from instdir.
    
    (Should those tests also set UNO_JAVA_JFW_ENV_JREHOME=true, as is done in
    unotest/source/cpp/officeconnection.cxx and
    unotest/source/java/org/openoffice/test/OfficeConnection.java?)
    
    Change-Id: Iabf1198246c17410e71d5b85454662ff85a7b478
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88112
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 1c74d216b625..d914cf83faaa 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -383,7 +383,8 @@ $(call gb_CppunitTest_get_target,$(1)) : \
     $(call gb_Library_get_target,jvmaccess) \
     $(call gb_Library_get_target,jvmfwk) \
     $(call gb_Package_get_target,jvmfwk_javavendors) \
-    $(call gb_Package_get_target,jvmfwk_jreproperties)
+    $(call gb_Package_get_target,jvmfwk_jreproperties) \
+    $(call gb_Package_get_target,jvmfwk_jvmfwk3_ini) \
 
 endef