From 1cae5c183f122cc8de88786974ce7f6aa53fbd91 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 6 Dec 2011 20:21:30 +0100 Subject: [PATCH] Moved modifications.xcu to test, used from multiple modules. --- sc/CppunitTest_sc_cellrangesbase.mk | 2 +- sc/CppunitTest_sc_macros_test.mk | 2 +- sc/CppunitTest_sc_tableautoformatfield.mk | 2 +- sw/CppunitTest_sw_macros_test.mk | 2 +- test/prj/d.lst | 2 ++ {sc/qa/unit/data => test/user-template}/registry/modifications.xcd | 0 6 files changed, 6 insertions(+), 4 deletions(-) rename {sc/qa/unit/data => test/user-template}/registry/modifications.xcd (100%) diff --git a/sc/CppunitTest_sc_cellrangesbase.mk b/sc/CppunitTest_sc_cellrangesbase.mk index 98d16832a27d..dd1028f040c7 100644 --- a/sc/CppunitTest_sc_cellrangesbase.mk +++ b/sc/CppunitTest_sc_cellrangesbase.mk @@ -129,7 +129,7 @@ $(eval $(call gb_CppunitTest_add_old_components,sc_cellrangesbase,\ $(eval $(call gb_CppunitTest_set_args,sc_cellrangesbase,\ --headless \ --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,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 080939db9fab..de530e2e3676 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -130,7 +130,7 @@ $(eval $(call gb_CppunitTest_add_old_components,sc_macros_test,\ $(eval $(call gb_CppunitTest_set_args,sc_macros_test,\ --headless \ --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,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index 7178929ebcc0..c07955e07d82 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -128,7 +128,7 @@ $(eval $(call gb_CppunitTest_add_old_components,sc_tableautoformatfield,\ $(eval $(call gb_CppunitTest_set_args,sc_tableautoformatfield,\ --headless \ --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,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 403c7e6e0c7e..25b835792bd3 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -130,7 +130,7 @@ $(eval $(call gb_CppunitTest_add_old_components,sw_macros_test,\ $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\ --headless \ --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,$(OUTDIR)/unittest/registry)" \ )) # .../spool is required for the (somewhat strange) filter configuration diff --git a/test/prj/d.lst b/test/prj/d.lst index a0218529c458..92ced03672f8 100644 --- a/test/prj/d.lst +++ b/test/prj/d.lst @@ -8,6 +8,7 @@ mkdir: %_DEST%\inc\test ..\inc\test\bootstrapfixture.hxx %_DEST%\inc\test\bootstrapfixture.hxx ..\inc\test\unoapi_test.hxx %_DEST%\inc\test\unoapi_test.hxx mkdir: %_DEST%\unittest +mkdir: %_DEST%\unittest\registry mkdir: %_DEST%\unittest\user\ mkdir: %_DEST%\unittest\user\autocorr mkdir: %_DEST%\unittest\user\autotext @@ -201,6 +202,7 @@ mkdir: %_DEST%\unittest\user\xslt\import\common mkdir: %_DEST%\unittest\user\xslt\import\spreadsheetml mkdir: %_DEST%\unittest\user\xslt\import\uof mkdir: %_DEST%\unittest\user\xslt\import\wordml +..\user-template\registry\modifications.xcd %_DEST%\unittest\registry\modifications.xcd ..\user-template\user\* %_DEST%\unittest\user\* ..\user-template\user\autocorr\* %_DEST%\unittest\user\autocorr\* ..\user-template\user\autotext\* %_DEST%\unittest\user\autotext\* diff --git a/sc/qa/unit/data/registry/modifications.xcd b/test/user-template/registry/modifications.xcd similarity index 100% rename from sc/qa/unit/data/registry/modifications.xcd rename to test/user-template/registry/modifications.xcd -- 2.11.4.GIT