[Libreoffice] add sqlite path to library path for unit tests

[Markus Mohrhard]

Hey,

could someone without system libsqlite give the following patch a try.
Apply and rebuild sc. In theory the testPassword test should work
without a problem.

Thanks a lot for your help

Markus

From fc3316ac36beacf49fad044563dd8b3ea7967172 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon, 14 Nov 2011 23:41:57 +0100
Subject: [PATCH] add sqlite path to library path and enable testPassword

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

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/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 7fa338a..06c30bc 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -363,7 +363,7 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib:$(OUTDIR)/lib/sqlite
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .dylib
 gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index a96f90a..83d26f7 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -362,7 +362,7 @@ endef
 
 # CppunitTest class
 
-gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
+gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib:$(OUTDIR_FOR_BUILD)/lib/sqlite
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .so
 gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
-- 
1.7.3.4


_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice