[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac sd/qa sw/qa
Mayank Gupta
techfreakworm at gmail.com
Tue Mar 22 12:26:48 UTC 2016
config_host/config_features.h.in | 5 +++++
configure.ac | 1 +
sd/qa/unit/export-tests.cxx | 11 +++++++++--
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 6 ++++--
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 14 +++++++++++++-
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 13 +++++++++++++
6 files changed, 45 insertions(+), 5 deletions(-)
New commits:
commit af06ced81c640ebbcac037cd610bc99694fb7c13
Author: Mayank Gupta <techfreakworm at gmail.com>
Date: Fri Mar 11 15:45:43 2016 +0530
add HAVE_FEATURE_ATL to disable failing tests due to ATL
Change-Id: Ifcdf8bf9eb4c22df6493f85592c9c72fac28876e
Reviewed-on: https://gerrit.libreoffice.org/23144
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 5426bf3..d80d134 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -151,4 +151,9 @@
*/
#define HAVE_FEATURE_BREAKPAD 0
+/*
+ * Whether to enable ATL
+ */
+#define HAVE_FEATURE_ATL 0
+
#endif
diff --git a/configure.ac b/configure.ac
index d2bdd4d..62ee6bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3760,6 +3760,7 @@ if test "$_os" = "WINNT" -a "$WITH_MINGW" != yes; then
AC_MSG_CHECKING([whether to use ATL])
if test "$enable_atl" = "yes" -o "$enable_atl" = "" -a "$vcexpress" != Express; then
DISABLE_ATL=""
+ AC_DEFINE(HAVE_FEATURE_ATL, 1)
AC_MSG_RESULT([yes])
else
DISABLE_ATL="TRUE"
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index a81d32f..59e49d2 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -75,7 +75,6 @@
#include <svx/svdotable.hxx>
-
#include <config_features.h>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
@@ -147,7 +146,10 @@ public:
void testFdo90607();
void testTdf91378();
+//This test gives errors due to ATL
+#if HAVE_FEATURE_ATL
void testBnc822341();
+#endif
void testMathObject();
void testMathObjectPPT2010();
void testTdf80224();
@@ -187,8 +189,10 @@ public:
CPPUNIT_TEST(testParaMarginAndindentation);
CPPUNIT_TEST(testTransparentBackground);
CPPUNIT_TEST(testTdf91378);
-
+//This test gives errors due to ATL
+#if HAVE_FEATURE_ATL
CPPUNIT_TEST(testBnc822341);
+#endif
CPPUNIT_TEST(testMathObject);
CPPUNIT_TEST(testMathObjectPPT2010);
CPPUNIT_TEST(testTdf80224);
@@ -1112,6 +1116,8 @@ void SdExportTest::testTdf91378()
xDocShRef->DoClose();
}
+//This test gives errors due to ATL
+#if HAVE_FEATURE_ATL
void SdExportTest::testBnc822341()
{
// Check import / export of embedded text document
@@ -1181,6 +1187,7 @@ void SdExportTest::testBnc822341()
xDocShRef->DoClose();
}
+#endif
void SdExportTest::testMathObject()
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 66766e4..f4174d61 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -18,9 +18,8 @@
#include <com/sun/star/text/XTextRangeCompare.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
#include <oox/drawingml/drawingmltypes.hxx>
-
+#include <config_features.h>
#include <string>
-
class Test : public SwModelTestBase
{
public:
@@ -82,11 +81,14 @@ protected:
}
};
+//This test gives errors due to ATL
+#if HAVE_FEATURE_ATL
DECLARE_OOXMLEXPORT_TEST(testfdo81381, "fdo81381.docx")
{
if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:object[1]/o:OLEObject[1]", "DrawAspect", "Icon");
}
+#endif
DECLARE_OOXMLEXPORT_TEST(testSdtAlias, "sdt-alias.docx")
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 041e54b..7b4e2cd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -49,7 +49,7 @@
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/drawing/Hatch.hpp>
-
+#include <config_features.h>
#include <string>
class Test : public SwModelTestBase
@@ -466,6 +466,8 @@ DECLARE_OOXMLEXPORT_TEST(testAbi11739, "abi11739.docx")
CPPUNIT_ASSERT(getXPathPosition(pXmlDoc, "/w:styles/w:style[11]", "unhideWhenUsed") < getXPathPosition(pXmlDoc, "/w:styles/w:style[11]", "qFormat"));
}
+//This test gives error due to ATL
+#if HAVE_FEATURE_ATL
DECLARE_OOXMLEXPORT_TEST(testEmbeddedXlsx, "embedded-xlsx.docx")
{
// check there are two objects and they are FrameShapes
@@ -496,6 +498,7 @@ DECLARE_OOXMLEXPORT_TEST(testEmbeddedXlsx, "embedded-xlsx.docx")
CPPUNIT_ASSERT_EQUAL(2, nSheetFiles);
CPPUNIT_ASSERT_EQUAL(2, nImageFiles);
}
+#endif
DECLARE_OOXMLEXPORT_TEST(testNumberedLists_StartingWithZero, "FDO74105.docx")
{
@@ -531,6 +534,8 @@ DECLARE_OOXMLEXPORT_TEST(testPageBreak,"fdo74566.docx")
getRun(xParagraph4, 1, "Second Page First line after Page Break");
}
+//This test gives errors due to ATL
+#if HAVE_FEATURE_ATL
DECLARE_OOXMLEXPORT_TEST(testOleObject, "test_ole_object.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
@@ -558,6 +563,7 @@ DECLARE_OOXMLEXPORT_TEST(testOleObject, "test_ole_object.docx")
"application/vnd.openxmlformats-officedocument.oleObject");
}
+#endif
DECLARE_OOXMLEXPORT_TEST(testFdo74792, "fdo74792.docx")
{
@@ -707,6 +713,8 @@ DECLARE_OOXMLEXPORT_TEST(testParagraphWithComments, "paragraphWithComments.docx"
CPPUNIT_ASSERT_EQUAL( idInDocXml, idInCommentXml );
}
+//This features gives error due to ATL
+#if HAVE_FEATURE_ATL
DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader, "2129393649.docx")
{
// fdo#76015 : Document contains oleobject in header xml.
@@ -739,6 +747,7 @@ DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader, "2129393649.docx")
"ProgID",
"Word.Picture.8");
}
+#endif
DECLARE_OOXMLEXPORT_TEST(test_ClosingBrace, "2120112713.docx")
{
@@ -884,6 +893,8 @@ DECLARE_OOXMLEXPORT_TEST(testSimpleSdts, "simple-sdts.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:citation", 1);
}
+//This feature gives error due to ATL
+#if HAVE_FEATURE_ATL
DECLARE_OOXMLEXPORT_TEST(testEmbeddedExcelChart, "EmbeddedExcelChart.docx")
{
xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -910,6 +921,7 @@ DECLARE_OOXMLEXPORT_TEST(testEmbeddedExcelChart, "EmbeddedExcelChart.docx")
"ProgID",
"Excel.Chart.8");
}
+#endif
DECLARE_OOXMLEXPORT_TEST(testTdf83227, "tdf83227.docx")
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 95794d1..384fe51 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -53,6 +53,7 @@
#include <com/sun/star/rdf/Statement.hpp>
#include <string>
+#include <config_features.h>
class Test : public SwModelTestBase
{
@@ -372,6 +373,8 @@ DECLARE_OOXMLEXPORT_TEST(testFDO77812, "fdo77812.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:cols/w:col[2]", 1);
}
+//This test gives errors due to ATL
+#if HAVE_FEATURE_ATL
DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, "fdo77759.docx")
{
xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -397,6 +400,7 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, "fdo77759.docx")
"ProgID",
"Excel.Sheet.12");
}
+#endif
DECLARE_OOXMLEXPORT_TEST(testfdo78420, "fdo78420.docx")
{
@@ -733,6 +737,8 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsm, "fdo79969_xlsm.docx")
"Excel.SheetMacroEnabled.12");
}
+//This test gives errors due to ATL
+#if HAVE_FEATURE_ATL
DECLARE_OOXMLEXPORT_TEST(testfdo80522,"fdo80522.docx")
{
xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -758,7 +764,10 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80522,"fdo80522.docx")
"ProgID",
"Word.DocumentMacroEnabled.12");
}
+#endif
+//This test gives errors due to ATL
+#if HAVE_FEATURE_ATL
DECLARE_OOXMLEXPORT_TEST(testfdo80523_pptm,"fdo80523_pptm.docx")
{
xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -784,6 +793,7 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80523_pptm,"fdo80523_pptm.docx")
"ProgID",
"PowerPoint.ShowMacroEnabled.12");
}
+#endif
DECLARE_OOXMLEXPORT_TEST(testfdo80523_sldm,"fdo80523_sldm.docx")
{
@@ -811,6 +821,8 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80523_sldm,"fdo80523_sldm.docx")
"PowerPoint.SlideMacroEnabled.12");
}
+//This test gives errors due to ATL
+#if HAVE_FEATURE_ATL
DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx")
{
// This UT for DOCX embedded with binary excel work sheet.
@@ -837,6 +849,7 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx")
"ProgID",
"Word.Document.8");
}
+#endif
DECLARE_OOXMLEXPORT_TEST(testTableCellWithDirectFormatting, "fdo80800.docx")
{
More information about the Libreoffice-commits
mailing list