diff options
| author | David Ostrovsky <David.Ostrovsky@gmx.de> | 2012-05-19 01:25:08 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:34:59 +0200 |
| commit | cc6cc8f6b8be4f42d93e2380d4d8079f34cda0a9 (patch) | |
| tree | 6a87da799a51615016a8acf62d078eb8df879c15 /testtools | |
| parent | 84b6bb4ba854234eb7c7e736013ef6fbb2d22507 (diff) | |
create batch files for test
Change-Id: I651bcd35c0a29917bcea21e26a3985b8cf101f7e
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/CustomTarget_bridgetest.mk | 38 | ||||
| -rw-r--r-- | testtools/Rdb_uno_services.mk | 6 |
2 files changed, 40 insertions, 4 deletions
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index 85a025029ac8..32d877b5f970 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 7775c942f1dd..9fc0dea60577 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: |