sw/qa/extras/rtfimport/rtfimport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b308e7934002ff5d0fa1da9ae18384f674606dc9
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Tue Apr 26 12:56:33 2016 +0200

    CppunitTest_sw_rtfimport: disable testTdf90097 on OS X
    
    As it fails on MacOSX-x86_64@49-TDF. It's strange, as it passed Jenkins
    verification...
    
    Change-Id: I04e4f091aff6855969bc40182c4b69b36f4a1b81

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 82e4cd2..3cc668f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2554,7 +2554,7 @@ DECLARE_RTFIMPORT_TEST(testClassificatonPasteLevels, 
"classification-confidentia
     CPPUNIT_ASSERT_EQUAL(aOld, xText->getString());
 }
 
-#ifndef WNT
+#if !defined(MACOSX) && !defined(WNT)
 DECLARE_RTFIMPORT_TEST(testTdf90097, "tdf90097.rtf")
 {
     // Get the second child of the group shape.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to