diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-03-05 16:40:01 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-03-12 15:35:34 +0000 |
| commit | af969873cb01e44aacfa34623ce1f0d51a62c895 (patch) | |
| tree | 56436156bed18c9cc678687a29f6b5cdd5b5e495 /smoketest | |
| parent | 07352f07ce40ef40e9b73fd05aa4f9c5eac38290 (diff) | |
liblibo: better init code.
Change-Id: I8757739960cb1c764a5a66bd67d34731e3dfbf31
Diffstat (limited to 'smoketest')
| -rw-r--r-- | smoketest/CppunitTest_liblibreoffice.mk | 17 | ||||
| -rw-r--r-- | smoketest/libtest.cxx | 6 |
2 files changed, 7 insertions, 16 deletions
diff --git a/smoketest/CppunitTest_liblibreoffice.mk b/smoketest/CppunitTest_liblibreoffice.mk index 2cd345633d33..8755fe8a286d 100644 --- a/smoketest/CppunitTest_liblibreoffice.mk +++ b/smoketest/CppunitTest_liblibreoffice.mk @@ -15,29 +15,16 @@ $(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 \ libreoffice \ - sal \ - unotest \ )) ifeq ($(OS),MACOSX) -liblibreoffice_SOFFICE_INST := path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS +liblibreoffice_SOFFICE_INST := $(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS else -liblibreoffice_SOFFICE_INST := path:$(DEVINSTALLDIR)/opt/program +liblibreoffice_SOFFICE_INST := $(DEVINSTALLDIR)/opt/program endif -$(eval $(call gb_CppunitTest_use_ure,liblibreoffice)) - $(eval $(call gb_CppunitTest_add_arguments,liblibreoffice,\ -env:arg-soffice=$(liblibreoffice_SOFFICE_INST) \ )) diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx index 36c3a0c1e070..cc71d0814f80 100644 --- a/smoketest/libtest.cxx +++ b/smoketest/libtest.cxx @@ -46,7 +46,11 @@ void Test::test() rtl::Bootstrap::get( rtl::OUString( "arg-soffice" ), aArgSoffice ); OString aInstall = OUStringToOString( aArgSoffice, RTL_TEXTENCODING_UTF8 ); fprintf( stderr, "liblibreoffice test: '%s'\n", aInstall.getStr() ); - assert (lo_init( aInstall.getStr() )); + LibLibreOffice *pOffice = lo_init( aInstall.getStr() ); + CPPUNIT_ASSERT( pOffice != NULL ); + + bool bInited = pOffice->initialize( aInstall.getStr() ); + CPPUNIT_ASSERT( bInited ); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); |