[Libreoffice-commits] .: Branch 'feature/gbuild_testtools' - testtools/CustomTarget_bridgetest.mk testtools/CustomTarget_uno_test.mk testtools/Module_testtools.mk

[David Ostrovsky]

 testtools/CustomTarget_bridgetest.mk |   72 +++++++++++++++++++++++++++++++++++
 testtools/CustomTarget_uno_test.mk   |    4 -
 testtools/Module_testtools.mk        |    1 
 3 files changed, 75 insertions(+), 2 deletions(-)

New commits:
commit b149aa29e0953982beeeb1e80fff238495d42725
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date:   Sat May 19 00:26:29 2012 +0200

    CustomTarget_bridgetest
    
    Change-Id: I2457061286dcdfe8e07624cd235261e7ed731172

diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
new file mode 100644
index 0000000..85a0250
--- /dev/null
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -0,0 +1,72 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest))
+
+workdir_SERVER := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
+gb_UNO := $(OUTDIR)/bin/uno
+
+ifeq ($(OS),WNT)
+BATCH_SUFFIX := .bat
+GIVE_EXEC_RIGHTS=@echo
+else
+BATCH_SUFFIX :=
+GIVE_EXEC_RIGHTS=chmod +x
+endif
+
+$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
+	$(workdir_SERVER)/bridgetest_server$(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)" \
+		"-ro $(OUTDIR)/xml/uno_services.rdb" \
+		"-ro $(OUTDIR)/bin/udkapi.rdb" \
+		"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
+		"-s com.sun.star.test.bridge.BridgeTest" \
+		"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
+		"--singleaccept" > $@)
+	$(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)" \
+		"-ro $(OUTDIR)/xml/uno_services.rdb" \
+		"-ro $(OUTDIR)/bin/udkapi.rdb" \
+		"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
+		"-s com.sun.star.test.bridge.BridgeTest" \
+		"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
+		> $@)
+	$(GIVE_EXEC_RIGHTS) $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index a48a98e..15f8f89 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -25,14 +25,14 @@
 # instead of those above.
 
 $(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test))
-gb_UNO := $(OUTDIR)/bin/uno
+UNO_EXE := $(OUTDIR)/bin/uno
 
 # this target is phony to run it every time
 .PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test)
 
 $(call gb_CustomTarget_get_target,testtools/uno_test) : $(call gb_Rdb_get_target,uno_services) \
 	$(call gb_InternalUnoApi_get_target,bridgetest)
-	$(call gb_Helper_abbreviate_dirs_native, $(gb_UNO) \
+	$(call gb_Helper_abbreviate_dirs_native, $(UNO_EXE) \
 		-ro $(OUTDIR)/xml/uno_services.rdb \
 		-ro $(OUTDIR)/bin/udkapi.rdb \
 		-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 68382af..e6968d5 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,testtools,\
 	Library_constructors \
 	Rdb_uno_services \
 	CustomTarget_uno_test \
+	CustomTarget_bridgetest \
 ))
 
 ifneq ($(SOLAR_JAVA),)