[Libreoffice-commits] .: sc/qa solenv/gbuild

[Stephan Bergmann]

 sc/qa/unit/filters-test.cxx            |    2 +-
 solenv/gbuild/platform/com_GCC_defs.mk |    5 +++++
 solenv/gbuild/platform/macosx.mk       |    3 ++-
 solenv/gbuild/platform/solaris.mk      |    8 +++++++-
 solenv/gbuild/platform/unxgcc.mk       |    3 ++-
 5 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 450c49d93ffe9b49e643ade30a650105b9e5701c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Nov 15 09:02:41 2011 +0100

    add sqlite path to library path and enable testPassword
    
    plus gb_Helper_extend_ld_path normalization by sbergman at redhat.com

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 20cf95e..bcda710 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -187,7 +187,7 @@ public:
     CPPUNIT_TEST(testBugFixesODS);
     CPPUNIT_TEST(testBugFixesXLS);
     CPPUNIT_TEST(testBugFixesXLSX);
-    //CPPUNIT_TEST(testPassword);
+    CPPUNIT_TEST(testPassword);
 
     CPPUNIT_TEST_SUITE_END();
 
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index c73219e..f91b58e 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -117,6 +117,11 @@ endif
 
 gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib
 
+# $(1): list of directory pathnames to append at the end of the ld path
+define gb_Helper_extend_ld_path
+$(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir))
+endef
+
 
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 7fa338a..9d70d0b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -363,7 +363,8 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := \
+    $(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite)
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .dylib
 gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 711216a..28dbba8 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -137,6 +137,11 @@ gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
 gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
+# $(1): list of directory pathnames to append at the end of the ld path
+define gb_Helper_extend_ld_path
+$(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir))
+endef
+
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
@@ -342,7 +347,8 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
+gb_CppunitTest_CPPTESTPRECOMMAND := \
+    $(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite)
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .so
 gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index a96f90a..7df93f0 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -362,7 +362,8 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
+gb_CppunitTest_CPPTESTPRECOMMAND := \
+    $(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite)
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .so
 gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)