summaryrefslogtreecommitdiff
path: root/testtools/CustomTarget_uno_test.mk
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-12-30 12:27:04 +0100
committerDavid Tardon <dtardon@redhat.com>2012-12-30 17:15:48 +0100
commitedf6730fd572788bac28f9fdeb84d25edfe04c0f (patch)
tree933e13059c6330e3dbb40b339abc5e1751fff194 /testtools/CustomTarget_uno_test.mk
parent0d6f8e5c048d3caef43bf26f2ae683224dec6921 (diff)
add runtime deps for custom targets
Change-Id: I49272003ea72c84c9e81bc826820b0ac5f9d5008
Diffstat (limited to 'testtools/CustomTarget_uno_test.mk')
-rw-r--r--testtools/CustomTarget_uno_test.mk15
1 files changed, 3 insertions, 12 deletions
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index 381c7467ee61..7162611226b4 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -29,21 +29,12 @@ $(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 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_Executable_get_runtime_dependencies,uno) \
$(call gb_InternalUnoApi_get_target,bridgetest) \
- $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
- $(call gb_Package_get_target_for_build,cppuhelper_unorc) \
- $(call gb_Rdb_get_outdir_target,uno_services) \
- $(call gb_Rdb_get_outdir_target_for_build,ure/services) \
- $(call gb_UnoApiMerge_get_target_for_build,ure/types)
+ $(call gb_Rdb_get_outdir_target,uno_services)
$(call gb_Helper_abbreviate_dirs,\
- $(call gb_Executable_get_target_for_build,uno) \
+ $(call gb_Executable_get_command,uno) \
-s com.sun.star.test.bridge.BridgeTest \
-- com.sun.star.test.bridge.CppTestObject \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services)) \