diff options
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/CustomTarget_bridgetest.mk | 8 | ||||
| -rw-r--r-- | testtools/CustomTarget_bridgetest_climaker.mk | 2 | ||||
| -rw-r--r-- | testtools/CustomTarget_bridgetest_javamaker.mk | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index bbba541612e2..9329281d7a79 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -26,6 +26,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest) : \ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_Helper_abbreviate_dirs,\ echo \ "$(call gb_Executable_get_target_for_build,uno)" \ @@ -37,12 +38,14 @@ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ > $@) $(if $(filter-out WNT,$(OS)),chmod +x $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) testtools_MY_CLASSPATH := $(call gb_Jar_get_target,ridl)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,java_uno)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,juh) $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_Helper_abbreviate_dirs,\ echo \ "URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target,uno_services))" \ @@ -54,9 +57,11 @@ $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testto "singleaccept" \ > $@) $(if $(filter-out WNT,$(OS)),chmod +x $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_Helper_abbreviate_dirs,\ echo "JAVA_HOME=$(JAVA_HOME)" \ "$(call gb_Executable_get_target_for_build,uno)" \ @@ -67,9 +72,11 @@ $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te "-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \ > $@) $(if $(filter-out WNT,$(OS)),chmod +x $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_Helper_abbreviate_dirs,\ echo \ "$(call gb_Executable_get_target_for_build,uno)" \ @@ -80,5 +87,6 @@ $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ > $@) $(if $(filter-out WNT,$(OS)),chmod +x $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) # vim: set noet sw=4 ts=4: diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk index 55c78a97989e..aa1336e24d92 100644 --- a/testtools/CustomTarget_bridgetest_climaker.mk +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -21,11 +21,13 @@ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \ $(call gb_Executable_get_runtime_dependencies,climaker) \ | $(testtools_CLIDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CLM) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,climaker) \ $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ --out $@ -r $(call gb_CliUnoApi_get_target,cli_uretypes) \ -X $(call gb_UnoApiTarget_get_target,udkapi) \ $(call gb_UnoApiTarget_get_target,bridgetest) > /dev/null) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CLM) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk index 830290038c61..0ab401551510 100644 --- a/testtools/CustomTarget_bridgetest_javamaker.mk +++ b/testtools/CustomTarget_bridgetest_javamaker.mk @@ -20,8 +20,10 @@ $(testtools_JAVADIR)/done : \ $(call gb_Executable_get_runtime_dependencies,javamaker) \ | $(testtools_JAVADIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JVM) $(call gb_Helper_abbreviate_dirs, \ rm -r $(testtools_JAVADIR) && \ $(call gb_Helper_execute,javamaker -nD -O$(testtools_JAVADIR) -X$(call gb_UnoApiTarget_get_target,udkapi) $(call gb_UnoApiTarget_get_target,bridgetest) $(call gb_UnoApiTarget_get_target,performance)) && touch $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),JVM) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |