CustomTarget_uno_test added.

Change-Id: Ia6b99cc7ec7d911d46354c1c892d8a6bbd23e188

3 files changed, 44 insertions, 10 deletions

diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
new file mode 100644
index 000000000000..a48a98e81d4d
--- /dev/null
+++ b/testtools/CustomTarget_uno_test.mk
@@ -0,0 +1,42 @@
+# -*- 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@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/uno_test))
+gb_UNO := $(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) \
+		-ro $(OUTDIR)/xml/uno_services.rdb \
+		-ro $(OUTDIR)/bin/udkapi.rdb \
+		-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \
+		-s com.sun.star.test.bridge.BridgeTest \
+		-- com.sun.star.test.bridge.CppTestObject)
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 7368d4cb8460..68382afc1c10 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -28,14 +28,14 @@ $(eval $(call gb_Module_Module,testtools))
 
 $(eval $(call gb_Module_add_targets,testtools,\
 	InternalUnoApi_bridgetest \
+	StaticLibrary_bridgetest \
 	Library_cppobj \
 	Library_bridgetest \
 	Library_constructors \
-	StaticLibrary_bridgetest \
 	Rdb_uno_services \
+	CustomTarget_uno_test \
 ))
 
-
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,testtools,\
 	Jar_testComponent \
diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk
index 768463b8474e..7775c942f1dd 100644
--- a/testtools/Rdb_uno_services.mk
+++ b/testtools/Rdb_uno_services.mk
@@ -26,18 +26,10 @@
 
 $(eval $(call gb_Rdb_Rdb,uno_services))
 
-$(eval $(call gb_Rdb_use_custom_headers,uno_services,testtools/bridgetest_testComponent))
-
 $(eval $(call gb_Rdb_add_components,uno_services,\
     testtools/source/bridgetest/cppobj \
     testtools/source/bridgetest/constructors \
     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: