diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-20 14:58:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-20 14:58:13 +0100 |
| commit | b1a4afa3b45d7b256eaf5aa88497b092f0139c84 (patch) | |
| tree | 39f608dcc76050abca5fd54f79c3feb667e03872 /testtools/CustomTarget_uno_test.mk | |
| parent | 6cd49f7f225a28a1f5e79a47f809ecb13761ef7a (diff) | |
Always have UNO_SERVICES/TYPES set in in-build uno ini file
...so that 16f856a5ca827602362692907dfcf287aa91602e "Adapt climaker to
cppu::bootstrap_InitialComponentContext removal" does not fail. Starting uno
processes from within the build should thus use URE_MORE_SERVICES/TYPES now,
too.
Change-Id: I0a7cfacc804814a2688e54275ebc3e39540d307c
Diffstat (limited to 'testtools/CustomTarget_uno_test.mk')
| -rw-r--r-- | testtools/CustomTarget_uno_test.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk index 1b5328104727..b06cbeb56193 100644 --- a/testtools/CustomTarget_uno_test.mk +++ b/testtools/CustomTarget_uno_test.mk @@ -29,9 +29,11 @@ $(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test)) # this target is phony to run it every time .PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test) -# NOTE: the dependency on ure/services.rdb is also there because we need some -# of the URE libs from stoc and this is the easiest way to ensure they -# are available when the test is run .-) +# NOTE: the dependencies on ure/services.rdb and ure/types.rdb are implicitly +# required due to the settings for URE_SERVICES and URE_TYPES in +# cppuhelper/source/unorc; the dependency on ure/services.rdb is also there +# because we need some of the URE libs from stoc and this is the easiest way to +# ensure they are available when the test is run .-) $(call gb_CustomTarget_get_target,testtools/uno_test) : \ $(call gb_Executable_get_target_for_build,uno) \ $(call gb_InternalUnoApi_get_target,bridgetest) \ @@ -40,10 +42,11 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \ $(call gb_Rdb_get_outdir_target,uno_services) \ $(call gb_Rdb_get_outdir_target,ure/services) \ $(call gb_UnoApiMerge_get_target,ure/types) - $(call gb_Executable_get_target_for_build,uno) \ + $(call gb_Helper_abbreviate_dirs,\ + $(call gb_Executable_get_target_for_build,uno) \ -s com.sun.star.test.bridge.BridgeTest \ -- com.sun.star.test.bridge.CppTestObject \ - -env:UNO_SERVICES='$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,ure/services)) $(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services))' \ - -env:UNO_TYPES='$(call gb_Helper_make_url,$(call gb_UnoApiMerge_get_target,ure/types)) $(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)' + -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services)) \ + -env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |