diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-17 13:21:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-17 15:58:57 +0100 |
| commit | f2033c28f4ddb5984fc9b2374486f229f296d5f6 (patch) | |
| tree | 4969302f5a5c87c0c1f346ea393d112f6208a5b9 | |
| parent | 34d7a1d9bf0866b9dddb684e723d9f1e5e9a3697 (diff) | |
enable password export tests under macosx
gerrit says they build with this cert folder
disable variable in place
Change-Id: Ibf711a01e6c055613c65dd94d85b523e7c8b5acd
| -rw-r--r-- | sc/qa/unit/subsequent_export-test.cxx | 12 | ||||
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 60131bc99f3e..8cbb1fad04c2 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -84,14 +84,10 @@ public: virtual void setUp() override; virtual void tearDown() override; -#if !defined MACOSX && !defined DRAGONFLY ScDocShellRef saveAndReloadPassword( ScDocShell*, const OUString&, const OUString&, const OUString&, SfxFilterFlags ); -#endif void test(); -#if !defined MACOSX && !defined DRAGONFLY void testPasswordExport(); -#endif void testConditionalFormatExportODS(); void testConditionalFormatExportXLSX(); void testColorScaleExportODS(); @@ -178,9 +174,7 @@ public: CPPUNIT_TEST_SUITE(ScExportTest); CPPUNIT_TEST(test); -#if !defined(MACOSX) && !defined(DRAGONFLY) CPPUNIT_TEST(testPasswordExport); -#endif CPPUNIT_TEST(testConditionalFormatExportODS); CPPUNIT_TEST(testConditionalFormatExportXLSX); CPPUNIT_TEST(testColorScaleExportODS); @@ -294,7 +288,6 @@ void ScExportTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) } } -#if !defined MACOSX && !defined DRAGONFLY ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const OUString &rFilter, const OUString &rUserData, const OUString& rTypeName, SfxFilterFlags nFormatType) { @@ -329,7 +322,6 @@ ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const OUSt OUString aPass("test"); return load(aTempFile.GetURL(), rFilter, rUserData, rTypeName, nFormatType, nFormat, SOFFICE_FILEFORMAT_CURRENT, &aPass); } -#endif void ScExportTest::test() { @@ -352,7 +344,6 @@ void ScExportTest::test() xDocSh->DoClose(); } -#if !defined MACOSX && !defined DRAGONFLY void ScExportTest::testPasswordExport() { ScDocShell* pShell = new ScDocShell( @@ -363,7 +354,7 @@ void ScExportTest::testPasswordExport() ScDocument& rDoc = pShell->GetDocument(); - rDoc.SetValue(0,0,0, 1.0); + rDoc.SetValue(0, 0, 0, 1.0); sal_Int32 nFormat = FORMAT_ODS; OUString aFilterName(getFileFormats()[nFormat].pFilterName, strlen(getFileFormats()[nFormat].pFilterName), RTL_TEXTENCODING_UTF8) ; @@ -377,7 +368,6 @@ void ScExportTest::testPasswordExport() xDocSh->DoClose(); } -#endif void ScExportTest::testConditionalFormatExportODS() { diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 5532192fc2da..f192b1ea789f 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -21,6 +21,8 @@ # Cap the number of threads unittests use. export MAX_CONCURRENCY=4 +# Disable searching for certificates by default +export MOZILLA_CERTIFICATE_FOLDER=0 gb_CppunitTest_UNITTESTFAILED ?= $(GBUILDDIR)/platform/unittest-failed-default.sh gb_CppunitTest_PYTHONDEPS ?= $(call gb_Library_get_target,pyuno_wrapper) $(if $(SYSTEM_PYTHON),,$(call gb_Package_get_target,python3)) |