summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-09-05 21:00:33 +0200
committerMichael Stahl <mstahl@redhat.com>2012-09-05 21:01:48 +0200
commit800133e8c89b697f952aeb082686b13e618c45de (patch)
tree54e013270adbc3e09a2e6092b93728719b34794c /extensions
parentb1fd48de5fd7cd6385a63463d914d6d50e154bf9 (diff)
extensions: convert unoapi test to gbuild
It even seems to run on my system Change-Id: I0246467b82bec7617d6de7dbad84c45fc279c24c
Diffstat (limited to 'extensions')
-rw-r--r--extensions/JunitTest_extensions_unoapi.mk31
-rw-r--r--extensions/Module_extensions.mk4
-rw-r--r--extensions/qa/unoapi/makefile.mk41
3 files changed, 35 insertions, 41 deletions
diff --git a/extensions/JunitTest_extensions_unoapi.mk b/extensions/JunitTest_extensions_unoapi.mk
new file mode 100644
index 000000000000..0d98b1eab0b7
--- /dev/null
+++ b/extensions/JunitTest_extensions_unoapi.mk
@@ -0,0 +1,31 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_JunitTest_JunitTest,extensions_unoapi))
+
+$(eval $(call gb_JunitTest_set_defs,extensions_unoapi,\
+ $$(DEFS) \
+ -Dorg.openoffice.test.arg.sce=$(SRCDIR)/extensions/qa/unoapi/extensions.sce \
+ -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/extensions/qa/unoapi/knownissues.xcl \
+ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/extensions/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_use_jars,extensions_unoapi,\
+ OOoRunner \
+ ridl \
+ test \
+ unoil \
+ jurt \
+))
+
+$(eval $(call gb_JunitTest_add_classes,extensions_unoapi,\
+ org.openoffice.test.UnoApiTest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 0f7b6f1181d5..40ae09b9159c 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -135,4 +135,8 @@ $(eval $(call gb_Module_add_targets,extensions,\
))
endif # OS=MACOSX
+$(eval $(call gb_Module_add_subsequentcheck_targets,extensions,\
+ JunitTest_extensions_unoapi \
+))
+
# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/extensions/qa/unoapi/makefile.mk b/extensions/qa/unoapi/makefile.mk
deleted file mode 100644
index 76c65ebb9f2f..000000000000
--- a/extensions/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = extensions
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/extensions/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END