mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move c++ based subsequenttest to sc/qa/extras

Browse Source
This commit is contained in:
Markus Mohrhard
2011-11-30 20:09:22 +01:00
parent 130028f2b4
commit 3dbc46d99a
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sc/CppunitTest_sc_unoapi_xcellrangesquery.mk → sc/CppunitTest_sc_xcellrangesquery.mk
View File

@@ -28,13 +28,13 @@
# instead of those above. # instead of those above.
#************************************************************************* #*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,sc_unoapi_xcellrangesquery)) $(eval $(call gb_CppunitTest_CppunitTest,sc_xcellrangesquery))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_unoapi_xcellrangesquery, \ $(eval $(call gb_CppunitTest_add_exception_objects,sc_xcellrangesquery, \
sc/qa/unoapi/xcellrangesquery \ sc/qa/extras/xcellrangesquery \
)) ))
$(eval $(call gb_CppunitTest_add_linked_libs,sc_unoapi_xcellrangesquery, \ $(eval $(call gb_CppunitTest_add_linked_libs,sc_xcellrangesquery, \
avmedia \ avmedia \
basegfx \ basegfx \
comphelper \ comphelper \
@@ -71,25 +71,25 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_unoapi_xcellrangesquery, \
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(eval $(call gb_CppunitTest_set_include,sc_unoapi_xcellrangesquery,\ $(eval $(call gb_CppunitTest_set_include,sc_xcellrangesquery,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \ -I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \ $$(INCLUDE) \
-I$(OUTDIR)/inc \ -I$(OUTDIR)/inc \
)) ))
$(eval $(call gb_CppunitTest_add_api,sc_unoapi_xcellrangesquery,\ $(eval $(call gb_CppunitTest_add_api,sc_xcellrangesquery,\
offapi \ offapi \
udkapi \ udkapi \
)) ))
$(eval $(call gb_CppunitTest_uses_ure,sc_unoapi_xcellrangesquery)) $(eval $(call gb_CppunitTest_uses_ure,sc_xcellrangesquery))
$(eval $(call gb_CppunitTest_add_type_rdbs,sc_unoapi_xcellrangesquery,\ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_xcellrangesquery,\
types \ types \
)) ))
$(eval $(call gb_CppunitTest_add_components,sc_unoapi_xcellrangesquery,\ $(eval $(call gb_CppunitTest_add_components,sc_xcellrangesquery,\
basic/util/sb \ basic/util/sb \
comphelper/util/comphelp \ comphelper/util/comphelp \
dbaccess/util/dba \ dbaccess/util/dba \
@@ -118,14 +118,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_unoapi_xcellrangesquery,\
unoxml/source/service/unoxml \ unoxml/source/service/unoxml \
)) ))
$(eval $(call gb_CppunitTest_add_old_components,sc_unoapi_xcellrangesquery,\ $(eval $(call gb_CppunitTest_add_old_components,sc_xcellrangesquery,\
configmgr \ configmgr \
ucb1 \ ucb1 \
ucpfile1 \ ucpfile1 \
ucptdoc1 \ ucptdoc1 \
)) ))
$(eval $(call gb_CppunitTest_set_args,sc_unoapi_xcellrangesquery,\ $(eval $(call gb_CppunitTest_set_args,sc_xcellrangesquery,\
--headless \ --headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(SRCDIR)/sc/qa/unit/data/registry)" \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(SRCDIR)/sc/qa/unit/data/registry)" \
@@ -136,6 +136,6 @@ $(eval $(call gb_CppunitTest_set_args,sc_unoapi_xcellrangesquery,\
# a) explicitly depend on library msword because it is not implied by a link # a) explicitly depend on library msword because it is not implied by a link
# relation # relation
# b) explicitly depend on the sc resource files needed at unit-test runtime # b) explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_unoapi_xcellrangesquery) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc $(call gb_CppunitTest_get_target,sc_xcellrangesquery) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

2
sc/Module_sc.mk
View File

@@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_macros_test \ CppunitTest_sc_macros_test \
CppunitTest_sc_unoapi_xcellrangesquery \ CppunitTest_sc_xcellrangesquery \
JunitTest_sc_complex \ JunitTest_sc_complex \
JunitTest_sc_unoapi \ JunitTest_sc_unoapi \
)) ))

0
sc/qa/unoapi/testdocuments/xcellrangesquery.ods → sc/qa/extras/testdocuments/xcellrangesquery.ods
View File

0
sc/qa/unoapi/xcellrangesquery.cxx → sc/qa/extras/xcellrangesquery.cxx
View File

2
test/source/unoapi_test.cxx
View File

@@ -29,7 +29,7 @@
#include "test/unoapi_test.hxx" #include "test/unoapi_test.hxx"
UnoApiTest::UnoApiTest() UnoApiTest::UnoApiTest()
: m_aBaseString(RTL_CONSTASCII_USTRINGPARAM("/sc/qa/unoapi/testdocuments")) : m_aBaseString(RTL_CONSTASCII_USTRINGPARAM("/sc/qa/extras/testdocuments"))
{ {
} }