diff options
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/CustomTarget_bridgetest_climaker.mk | 2 | ||||
| -rw-r--r-- | testtools/CustomTarget_bridgetest_javamaker.mk | 2 | ||||
| -rw-r--r-- | testtools/CustomTarget_uno_test.mk | 15 |
3 files changed, 5 insertions, 14 deletions
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk index 2f04fa61fcbf..16f606f55ed4 100644 --- a/testtools/CustomTarget_bridgetest_climaker.mk +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \ $(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \ - $(call gb_Executable_get_target_for_build,climaker) \ + $(call gb_Executable_get_runtime_dependencies,climaker) \ | $(testtools_CLIDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) $(call gb_Helper_abbreviate_dirs, \ diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk index 2dd0af4a587f..ab4469c6c0c3 100644 --- a/testtools/CustomTarget_bridgetest_javamaker.mk +++ b/testtools/CustomTarget_bridgetest_javamaker.mk @@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(testtools_ $(testtools_JAVADIR)/done : \ $(call gb_UnoApiTarget_get_target,bridgetest) \ $(OUTDIR)/bin/types.rdb \ - $(call gb_Executable_get_target_for_build,javamaker) \ + $(call gb_Executable_get_runtime_dependencies,javamaker) \ | $(testtools_JAVADIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Helper_abbreviate_dirs, \ 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)) \ |