Kaydet (Commit) 450c49d9 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Stephan Bergmann

add sqlite path to library path and enable testPassword

plus gb_Helper_extend_ld_path normalization by sbergman@redhat.com
üst 96467149
...@@ -187,7 +187,7 @@ public: ...@@ -187,7 +187,7 @@ public:
CPPUNIT_TEST(testBugFixesODS); CPPUNIT_TEST(testBugFixesODS);
CPPUNIT_TEST(testBugFixesXLS); CPPUNIT_TEST(testBugFixesXLS);
CPPUNIT_TEST(testBugFixesXLSX); CPPUNIT_TEST(testBugFixesXLSX);
//CPPUNIT_TEST(testPassword); CPPUNIT_TEST(testPassword);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
......
...@@ -117,6 +117,11 @@ endif ...@@ -117,6 +117,11 @@ endif
gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib 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 # convert parameters filesystem root to native notation
# does some real work only on windows, make sure not to # does some real work only on windows, make sure not to
......
...@@ -363,7 +363,8 @@ endef ...@@ -363,7 +363,8 @@ endef
# CppunitTest class # 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_SYSPRE := libtest_
gb_CppunitTest_EXT := .dylib gb_CppunitTest_EXT := .dylib
gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
......
...@@ -137,6 +137,11 @@ gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs) ...@@ -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 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 # convert parameters filesystem root to native notation
# does some real work only on windows, make sure not to # does some real work only on windows, make sure not to
# break the dummy implementations on unx* # break the dummy implementations on unx*
...@@ -342,7 +347,8 @@ endef ...@@ -342,7 +347,8 @@ endef
# CppunitTest class # 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_SYSPRE := libtest_
gb_CppunitTest_EXT := .so gb_CppunitTest_EXT := .so
gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
......
...@@ -362,7 +362,8 @@ endef ...@@ -362,7 +362,8 @@ endef
# CppunitTest class # 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_SYSPRE := libtest_
gb_CppunitTest_EXT := .so gb_CppunitTest_EXT := .so
gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment