summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2013-11-09 06:02:57 +0100
committerLionel Elie Mamane <lionel@mamane.lu>2013-11-09 06:36:46 +0100
commit4c64b8851b851cd88c762fd782d19bbbecdcbb50 (patch)
tree6150b8c45accb7732b5860c007ca11d2d0fa682d
parenta071a29d4f7e8065a36a313027a007edac102e20 (diff)
fixup and enable dbaccess macros_test
Change-Id: Ic5599df7a2ad7f2f3a9f2794b16ef0a4ab698b06
-rw-r--r--dbaccess/CppunitTest_dbaccess_macros_test.mk7
-rw-r--r--dbaccess/Module_dbaccess.mk6
2 files changed, 6 insertions, 7 deletions
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 908600c05f28..8699214704d5 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
cppuhelper \
dba \
dbu \
- dbu \
sdbt \
drawinglayer \
editeng \
@@ -40,7 +39,8 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
svt \
svx \
svxcore \
- test \
+ test \
+ subsequenttest \
tl \
tk \
ucbhelper \
@@ -94,10 +94,13 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
+ xmloff/util/xo \
))
$(eval $(call gb_CppunitTest_use_configuration,dbaccess_macros_test))
+$(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_macros_test))
+
$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_macros_test))
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index e9eb146a6ddc..868cd81e34d7 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -39,6 +39,7 @@ endif
$(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_dialog_save \
+ CppunitTest_dbaccess_macros_test \
))
ifeq ($(ENABLE_JAVA),TRUE)
@@ -57,11 +58,6 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
endif
endif
-# disable test because it still fails in some situations
-# CppunitTest_dbaccess_macros_test \
-#
-
-
$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
JunitTest_dbaccess_complex \
JunitTest_dbaccess_unoapi \