[Libreoffice-commits] .: 2 commits - sal/CppunitTest_sal_rtl_uri.mk sal/textenc

[Libreoffice Gerrit user]

 sal/CppunitTest_sal_rtl_uri.mk |    8 ++++++++
 sal/textenc/textenc.cxx        |    5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit e63bba0013e5ce34cd04559632206bb7c891eebe
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Sep 14 16:47:20 2012 +0200

    sal_rtl_uri unittest seems to depend on sal_textenc library too
    
    Change-Id: I3b85f3916d49a1853d073879a906506bee0d4fba

diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk
index 125265c..1da1b1b 100644
--- a/sal/CppunitTest_sal_rtl_uri.mk
+++ b/sal/CppunitTest_sal_rtl_uri.mk
@@ -25,4 +25,12 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\
     $(gb_STDLIBS) \
 ))
 
+# The test uses O(U)String capabilities that dlopen this lib
+ifneq ($(OS),ANDROID)
+# Except that on Android we don't build it separately
+$(call gb_CppunitTest_get_target,sal_rtl_uri) : \
+    $(call gb_Library_get_target,sal_textenc)
+endif
+
+
 # vim: set noet sw=4 ts=4:
commit 42990cc2041635c60f904d78e4adefcfd65cfeab
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Sep 14 16:44:46 2012 +0200

    better debug message when textenc module loading fails
    
    This is at least the second time there's a race condition during
    build, and OSL_TRACE is just SAL_INFO, i.e. not printed by default.
    
    Change-Id: I1c683cf463665c6e36097025756c3aeab3a2c330

diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index 8aeb67a..97288e4 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -390,14 +390,13 @@ class FullTextEncodingData: private boost::noncopyable {
 public:
     FullTextEncodingData() {
         if (!module_.loadRelative(&thisModule, SAL_MODULENAME("sal_textenc"))) {
-            OSL_TRACE("Loading sal_textenc library failed");
+            SAL_WARN( "sal.textenc", "Loading sal_textenc library failed" );
             std::abort();
         }
         function_ = reinterpret_cast< TextEncodingFunction * >(
             module_.getFunctionSymbol("sal_getFullTextEncodingData"));
         if (function_ == 0) {
-            OSL_TRACE(
-                "Obtaining sal_getFullTextEncodingData fuction from sal_textenc"
+            SAL_WARN( "sal.textenc", "Obtaining sal_getFullTextEncodingData fuction from sal_textenc"
                 " library failed");
             std::abort();
         }