[Libreoffice-commits] core.git: Branch 'feature/liblibo' - desktop/Library_libreoffice.mk smoketest/CppunitTest_liblibreoffice.mk smoketest/libtest.cxx smoketest/Module_smoketest.mk

Michael Meeks michael.meeks at suse.com
Tue Mar 5 05:41:38 PST 2013


 desktop/Library_libreoffice.mk          |   44 ++++++++++++++++++++++++++++++++
 smoketest/CppunitTest_liblibreoffice.mk |   44 ++++++++++++++++++++++++++++++++
 smoketest/Module_smoketest.mk           |    4 ++
 smoketest/libtest.cxx                   |   37 ++++++++++++++++++++++++++
 4 files changed, 129 insertions(+)

New commits:
commit 2758f8877e6975e52f1cb4805ab402d18e059006
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Mar 5 13:40:46 2013 +0000

    liblibo: stub a test harness.
    
    Change-Id: I428e0549290059101df66c30d8e1fb3700df05d0

diff --git a/desktop/Library_libreoffice.mk b/desktop/Library_libreoffice.mk
new file mode 100644
index 0000000..bea7f2f
--- /dev/null
+++ b/desktop/Library_libreoffice.mk
@@ -0,0 +1,44 @@
+# -*- 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_Library_Library,libreoffice))
+
+$(eval $(call gb_Library_set_include,libreoffice,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/desktop/inc \
+))
+
+$(eval $(call gb_Library_use_external,libreoffice,boost_headers))
+
+$(eval $(call gb_Library_use_sdk_api,libreoffice))
+
+$(eval $(call gb_Library_use_libraries,libreoffice,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    deploymentmisc \
+    i18nisolang1 \
+    sal \
+    salhelper \
+    sfx \
+    svl \
+    svt \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,libreoffice,\
+    desktop/source/lib/init \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/CppunitTest_liblibreoffice.mk b/smoketest/CppunitTest_liblibreoffice.mk
new file mode 100644
index 0000000..9a333c9
--- /dev/null
+++ b/smoketest/CppunitTest_liblibreoffice.mk
@@ -0,0 +1,44 @@
+# -*- 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_CppunitTest_CppunitTest,liblibreoffice))
+
+$(eval $(call gb_CppunitTest_abort_on_assertion,liblibreoffice))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,liblibreoffice,\
+	smoketest/libtest \
+))
+
+$(eval $(call gb_CppunitTest_use_external,liblibreoffice,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_api,liblibreoffice,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,liblibreoffice,\
+	cppu \
+	cppuhelper \
+	sal \
+	unotest \
+))
+
+ifeq ($(OS),MACOSX)
+liblibreoffice_SOFFICE_INST := path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS
+else
+liblibreoffice_SOFFICE_INST := path:$(DEVINSTALLDIR)/opt/program
+endif
+
+$(eval $(call gb_CppunitTest_use_ure,liblibreoffice))
+
+$(eval $(call gb_CppunitTest_add_arguments,liblibreoffice,\
+	-env:arg-soffice=$(liblibreoffice_SOFFICE_INST) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 9de8a44..9a2aa72 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -42,6 +42,10 @@ $(eval $(call gb_Module_add_targets,smoketest,\
 ))
 endif
 
+$(eval $(call gb_Module_add_check_targets,smoketest,\
+	CppunitTest_liblibreoffice \
+))
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\
 	CppunitTest_smoketest \
 ))
diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx
new file mode 100644
index 0000000..53c836a
--- /dev/null
+++ b/smoketest/libtest.cxx
@@ -0,0 +1,37 @@
+// yuck / FIXME ...
+#include "../desktop/inc/liblibreoffice.h"
+
+#include <sal/types.h>
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
+
+class Test: public CppUnit::TestFixture {
+public:
+    virtual void setUp();
+    virtual void tearDown();
+
+private:
+    CPPUNIT_TEST_SUITE(Test);
+    CPPUNIT_TEST(test);
+    CPPUNIT_TEST_SUITE_END();
+
+    void test();
+};
+
+void Test::setUp()
+{
+}
+void Test::tearDown()
+{
+}
+
+void Test::test()
+{
+  fprintf( stderr, " test me !\n" );
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+
+CPPUNIT_PLUGIN_IMPLEMENT();


More information about the Libreoffice-commits mailing list