[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/qa

Michael Stahl mstahl at redhat.com
Wed Feb 7 12:31:19 UTC 2018


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

New commits:
commit 315f452229ab8c0eb1c8a5964ed7108c877d6f13
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Feb 5 16:53:03 2018 +0100

    sw: disable testTableKeep on WNT
    
    Fails from time to time, like so:
    https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1517842001.29090#err2
    
    Change-Id: Ia33193fbfa05da58d31bcc5008beea32c1feb2fe
    (cherry picked from commit b2a053160c4c8eb0acd66b74c52dbda23a654bda)
    Reviewed-on: https://gerrit.libreoffice.org/49288
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 825ba6be7cf0..bcbaad089c59 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -1295,7 +1295,7 @@ DECLARE_WW8EXPORT_TEST(testCommentExport, "comment-export.odt")
     }
 }
 
-#if !defined(MACOSX)
+#if !defined(MACOSX) && !defined(_WIN32)
 #if !TEST_FONTS_MISSING
 DECLARE_WW8EXPORT_TEST(testTableKeep, "tdf91083.odt")
 {


More information about the Libreoffice-commits mailing list