public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a definitely rendering-dependent LibreOffice test (only the equality part); hopefully should fix the build

Browse Source
This commit is contained in:
Michael Raskin 2016-07-15 18:37:15 +02:00
parent cde541236a
commit 3223ef5df5
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/office/libreoffice/default.nix
View File

@ -124,6 +124,8 @@ in stdenv.mkDerivation rec {
sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
# one more fragile test? # one more fragile test?
sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx 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"; makeFlags = "SHELL=${bash}/bin/bash";

2
pkgs/applications/office/libreoffice/still.nix
View File

@ -124,6 +124,8 @@ in stdenv.mkDerivation rec {
sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
# one more fragile test? # one more fragile test?
sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx 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"; makeFlags = "SHELL=${bash}/bin/bash";