testtools/CustomTarget_bridgetest.mk | 38 +++++++++++++++++++++++++++++++----
testtools/Rdb_uno_services.mk | 6 +++++
2 files changed, 40 insertions(+), 4 deletions(-)
New commits:
commit 9039bda69c3f2406565e7617327fd9f34e377a01
Author: David Ostrovsky <david.ostrov...@gmx.de>
Date: Sat May 19 01:25:08 2012 +0200
create batch files for test
Change-Id: I651bcd35c0a29917bcea21e26a3985b8cf101f7e
diff --git a/testtools/CustomTarget_bridgetest.mk
b/testtools/CustomTarget_bridgetest.mk
index 85a0250..32d877b 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest))
workdir_SERVER := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
-gb_UNO := $(OUTDIR)/bin/uno
+UNO_EXE := $(OUTDIR)/bin/uno
ifeq ($(OS),WNT)
BATCH_SUFFIX := .bat
@@ -39,14 +39,16 @@ endif
$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
- $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX)
+ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \
+ $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) \
+ $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) \
# which other prerequisits do we need here?
$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component |
$(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs_native,\
- echo "$(gb_UNO)" \
+ echo "$(UNO_EXE)" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
@@ -56,11 +58,39 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
$(GIVE_EXEC_RIGHTS) $@
# which other prerequisits do we need here?
+$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \
+ $(SRCDIR)/testtools/source/bridgetest/*.component |
$(workdir_SERVER)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ echo "java" \
+ "-classpath $(OUTDIR)/bin/testComponent.jar" \
+ "com.sun.star.comp.bridge.TestComponentMain" \
+
\""uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test"\" \
+ "singleaccept"> $@)
+ $(GIVE_EXEC_RIGHTS) $@
+
+# which other prerequisites do we need here?
+$(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : \
+ $(SRCDIR)/testtools/source/bridgetest/*.component |
$(workdir_SERVER)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ echo "JAVA_HOME=$(JAVA_HOME) $(UNO_EXE)" \
+ "-ro $(OUTDIR)/xml/uno_services.rdb" \
+ "-ro $(OUTDIR)/bin/udkapi.rdb" \
+ "-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
+ "-s com.sun.star.test.bridge.BridgeTest" \
+ "-env:URE_INTERNAL_JAVA_DIR=$(OUTDIR)/bin" \
+ "-env:URE_INTERNAL_LIB_DIR=$(OUTDIR)/lib" \
+ "-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \
+ > $@)
+ $(GIVE_EXEC_RIGHTS) $@
+
+# which other prerequisits do we need here?
$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component |
$(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs_native,\
- echo "$(gb_UNO)" \
+ echo "$(UNO_EXE)" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk
index 7775c94..9fc0dea 100644
--- a/testtools/Rdb_uno_services.mk
+++ b/testtools/Rdb_uno_services.mk
@@ -32,4 +32,10 @@ $(eval $(call gb_Rdb_add_components,uno_services,\
testtools/source/bridgetest/bridgetest \
))
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Rdb_add_components,uno_services,\
+ testtools/source/bridgetest/testComponent \
+))
+endif
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
