diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-10 12:52:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-10 19:47:02 +0000 |
| commit | e0d442b1995082fd28614d51b85cb4248ba8189d (patch) | |
| tree | a6a18e60680f1e3c675b45201c0711671de1b123 | |
| parent | ae94c223e2e21e42fc7feca72402b910e5eab5c7 (diff) | |
try enabling password tests on mac and windows
Change-Id: I4054a3c285828f8c5a7d2c4b6e2716fd79c5fdf7
Reviewed-on: https://gerrit.libreoffice.org/29666
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 35da74f4689d..8088e71519bb 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -179,11 +179,9 @@ public: void testErrorOnExternalReferences(); //misc tests unrelated to the import filters -#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(_WIN32) void testPasswordNew(); void testPasswordOld(); void testPasswordWrongSHA(); -#endif //test shape import void testControlImport(); @@ -320,11 +318,9 @@ public: //disable testPassword on MacOSX due to problems with libsqlite3 //also crashes on DragonFly due to problems with nss/nspr headers -#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(_WIN32) CPPUNIT_TEST(testPasswordWrongSHA); CPPUNIT_TEST(testPasswordOld); CPPUNIT_TEST(testPasswordNew); -#endif CPPUNIT_TEST(testMiscRowHeights); CPPUNIT_TEST(testOptimalHeightReset); @@ -359,9 +355,7 @@ public: CPPUNIT_TEST_SUITE_END(); private: -#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(_WIN32) void testPassword_Impl(const OUString& rFileNameBase); -#endif uno::Reference<uno::XInterface> m_xCalcComponent; }; @@ -1554,7 +1548,6 @@ void ScFiltersTest::testRowIndex1BasedXLSX() xDocSh->DoClose(); } -#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(_WIN32) void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase) { OUString aFileExtension(getFileFormats()[0].pName, strlen(getFileFormats()[0].pName), RTL_TEXTENCODING_UTF8 ); @@ -1608,7 +1601,6 @@ void ScFiltersTest::testPasswordWrongSHA() const OUString aFileNameBase("passwordWrongSHA."); testPassword_Impl(aFileNameBase); } -#endif void ScFiltersTest::testControlImport() { |