testtools/CustomTarget_bridgetest.mk | 18 +-----------------
testtools/CustomTarget_uno_test.mk | 12 ++++++++++--
2 files changed, 11 insertions(+), 19 deletions(-)
New commits:
commit 32c845cb4389aba9430ce471b04f2891f5ff630d
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jan 3 11:16:03 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Jan 3 11:57:27 2023 +0000
Move manual bridgetest_inprocess_java to automatic CustomTarget_uno_test
check
Change-Id: I38ae06444adba4eb924a19291f466548ec11b024
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144984
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/testtools/CustomTarget_bridgetest.mk
b/testtools/CustomTarget_bridgetest.mk
index 9329281d7a79..9e934f03498a 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -21,8 +21,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest) : \
$(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) \
$(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) \
$(if $(ENABLE_JAVA),\
-
$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) \
-
$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX))
+
$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX))
$(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :|
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
@@ -59,21 +58,6 @@
$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testto
$(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)" \
- "-s com.sun.star.test.bridge.BridgeTest" \
- "-env:LO_BUILD_LIB_DIR=$(call
gb_Helper_make_url,$(gb_Library_WORKDIR_FOR_BUILD))" \
- "-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call
gb_Rdb_get_target,uno_services))" \
- "-env:URE_MORE_TYPES=$(call
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
- "-- 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)
diff --git a/testtools/CustomTarget_uno_test.mk
b/testtools/CustomTarget_uno_test.mk
index 4850e5ca66b2..1a958c9b1209 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -18,7 +18,8 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
$(call gb_Package_get_target,instsetoo_native_setup_ure) \
$(call gb_Rdb_get_target,uno_services) \
$(call gb_Rdb_get_target,ure/services) \
- $(call gb_UnoApi_get_target,udkapi)
+ $(call gb_UnoApi_get_target,udkapi) \
+ $(if $(ENABLE_JAVA),$(call gb_Jar_get_target,testComponent))
ifneq ($(gb_SUPPRESS_TESTS),)
@true
else
@@ -28,7 +29,14 @@ else
-- com.sun.star.test.bridge.CppTestObject \
-env:LO_BUILD_LIB_DIR=$(call
gb_Helper_make_url,$(gb_Library_WORKDIR_FOR_BUILD)) \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call
gb_Rdb_get_target,uno_services)) \
- -env:URE_MORE_TYPES=$(call
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb))
+ -env:URE_MORE_TYPES=$(call
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb) \
+ $(if $(ENABLE_JAVA), && \
+ $(call gb_Executable_get_command,uno) \
+ -s com.sun.star.test.bridge.BridgeTest \
+ -- com.sun.star.test.bridge.JavaTestObject
noCurrentContext \
+ -env:LO_BUILD_LIB_DIR=$(call
gb_Helper_make_url,$(gb_Library_WORKDIR_FOR_BUILD)) \
+ -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call
gb_Rdb_get_target,uno_services)) \
+ -env:URE_MORE_TYPES=$(call
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)))
endif
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
