diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2016-07-15 18:37:15 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2016-07-15 18:37:28 +0200 |
| commit | 3223ef5df509cba22e5a9d77b33d4438ecd22a67 (patch) | |
| tree | 3d9a4f751c9b707a34f25c1ca45b6057161b4c59 /pkgs/applications/office/libreoffice | |
| parent | cde541236a076519ed83fd3b7ba1231779b84f93 (diff) | |
| download | nixlib-3223ef5df509cba22e5a9d77b33d4438ecd22a67.tar nixlib-3223ef5df509cba22e5a9d77b33d4438ecd22a67.tar.gz nixlib-3223ef5df509cba22e5a9d77b33d4438ecd22a67.tar.bz2 nixlib-3223ef5df509cba22e5a9d77b33d4438ecd22a67.tar.lz nixlib-3223ef5df509cba22e5a9d77b33d4438ecd22a67.tar.xz nixlib-3223ef5df509cba22e5a9d77b33d4438ecd22a67.tar.zst nixlib-3223ef5df509cba22e5a9d77b33d4438ecd22a67.zip | |
Remove a definitely rendering-dependent LibreOffice test (only the equality part); hopefully should fix the build
Diffstat (limited to 'pkgs/applications/office/libreoffice')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 9c1e1b789900..63af5babca27 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -124,6 +124,8 @@ in stdenv.mkDerivation rec { sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # rendering-dependent test + sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx ''; makeFlags = "SHELL=${bash}/bin/bash"; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index b8ad900fb14a..eadf41356308 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -124,6 +124,8 @@ in stdenv.mkDerivation rec { sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # rendering-dependent test + sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx ''; makeFlags = "SHELL=${bash}/bin/bash"; |