diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-11-18 22:59:46 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-11-19 02:52:38 +0100 |
| commit | ed398366d510024e32d7124315c6e432bbe4ed0c (patch) | |
| tree | 2e599b913db90c82a0f0eafb4d7e8981b9821228 | |
| parent | 5e03999e937bc76f5020fa5b040bf403a5b37723 (diff) | |
remove libsqlite from macosx library path again and disable testPassword there
| -rw-r--r-- | sc/qa/unit/filters-test.cxx | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 195d5ef12061..cb99cd12fe20 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -199,7 +199,10 @@ public: CPPUNIT_TEST(testBugFixesODS); CPPUNIT_TEST(testBugFixesXLS); CPPUNIT_TEST(testBugFixesXLSX); + //disable testPassword on MacOSX due to problems with libsqlite3 +#if !defined(MACOSX) CPPUNIT_TEST(testPassword); +#endif #if TEST_BUG_FILES CPPUNIT_TEST(testBugFiles); diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 9d70d0b4c076..4b84db4f14d4 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -363,8 +363,7 @@ endef # CppunitTest class -gb_CppunitTest_CPPTESTPRECOMMAND := \ - $(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite) +gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path) gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .dylib gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) |