diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-19 16:48:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-19 16:53:09 +0100 |
| commit | 3f141809c84c8ac9a56c3cbf8ac7e872e44a6e0f (patch) | |
| tree | c6015f81a260698e264fd0117abcaa58c965f3fe /testtools/CustomTarget_uno_test.mk | |
| parent | 40af27d941ab578a341eefc63163b92d399262e7 (diff) | |
Make testtools use defaultBootstrap_InitialComponentContext
...instead of the ure executable's obsolte -ro arguments (leading to usage of
deprecated bootstrap_InitialComponentContext with an XSimpleRegistry instead),
similar to 0c1dc375b4bf0c8ff01fe51921767faa703b1295 "Make ure/source/uretest/
use defaultBootstrap_InitialComponentContext."
Change-Id: Idd35e27959f7650decfe78364d86614bafbbbec7
Diffstat (limited to 'testtools/CustomTarget_uno_test.mk')
| -rw-r--r-- | testtools/CustomTarget_uno_test.mk | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk index bed453d53f81..1b5328104727 100644 --- a/testtools/CustomTarget_uno_test.mk +++ b/testtools/CustomTarget_uno_test.mk @@ -29,22 +29,21 @@ $(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 there because we need some +# 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 .-) $(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_Executable_get_target_for_build,uno) \ $(call gb_InternalUnoApi_get_target,bridgetest) \ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ - $(call gb_Package_get_target,cppuhelper_unorc) - $(call gb_Helper_abbreviate_dirs,\ - $(call gb_Executable_get_target_for_build,uno) \ - -ro $(OUTDIR)/xml/uno_services.rdb \ - -ro $(OUTDIR)/bin/udkapi.rdb \ - -ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \ + $(call gb_Package_get_target,cppuhelper_unorc) \ + $(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) \ -s com.sun.star.test.bridge.BridgeTest \ - -- com.sun.star.test.bridge.CppTestObject) + -- 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)' # vim:set shiftwidth=4 tabstop=4 noexpandtab: |