diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:10:19 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:10:19 +0200 |
commit | a093a28ffe7cae74fb731e84dd3de09102763303 (patch) | |
tree | 8ce5586e27a76180d800c09f8b60d5cce3d1c140 /sw/JunitTest_sw_complex.mk | |
parent | 8dc7fcfb5e5a8de2411d2bb29f450cabc3690859 (diff) | |
parent | 99796d2482c2931a1023b8230a3f6b18d1f48ebf (diff) |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
sw/source/core/docnode/ndnotxt.cxx
sw/source/core/inc/viewimp.hxx
sw/source/core/layout/fly.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/filter/ww8/WW8TableInfo.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtww8.cxx
sw/source/filter/ww8/wrtww8.hxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/filter/xml/xmlitemi.cxx
sw/source/filter/xml/xmlmeta.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/shells/grfsh.cxx
Diffstat (limited to 'sw/JunitTest_sw_complex.mk')
-rwxr-xr-x | sw/JunitTest_sw_complex.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk index 84356e4c9f6f..0d59a5631a4d 100755 --- a/sw/JunitTest_sw_complex.mk +++ b/sw/JunitTest_sw_complex.mk @@ -65,7 +65,11 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\ # fd#35657 test disabled - reenable if fixed # complex.writer.TextPortionEnumerationTest \ -# currently fails (should run again in os146) (except on windows) -# complex.writer.CheckBookmarks \ +# CheckBookmarks currently fails on windows because the hashes are different +ifneq ($(OS),WNT) +$(eval $(call gb_JunitTest_add_classes,sw_complex,\ + complex.writer.CheckBookmarks \ +)) +endif # vim: set noet sw=4 ts=4: |