[Libreoffice-commits] core.git: sc/qa

[Tor Lillqvist]

 sc/qa/unit/subsequent_filters-test.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 219f2dc83f40afb7470bffc307371925e8fae018
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Dec 31 16:54:35 2014 +0200

    Ifdef out testSharedFormulaXLS() for now, fails for me with OpenCL on CPU
    
    IRC exchange:
    
    <tml> reverting 16bfddc makes the CppunitTest_sc_subsequent_filters_test not
    crash for me (Linux, with the AMDAPPSDK-2.9-1 OpenCL implementation, but no
    AND hardware, just an (Intel) CPU), but then it instead fails the
    ScFiltersTest::testSharedFormulaXLS
    
    <tml> the problem (in the non-reverted case) is that for some reason the
    pDVR->GetArrayLength() on line 131 returns a ridiculously large value in
    sc/source/core/opencl/formulagroupcl.cxx
    
    <tml> that seems to cause the alllocated buffer to actually be of zero size,
    according to valgrind (even if no OpenCL call returns failure...)
    
    <moggi> let me have aquick look
    
    <moggi> just comment out that line for now and I'll have a look at it during
    the weekend
    
    Change-Id: I5f9499ba1576cfa6d0945ecb19260a4b89c83e72

diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index bafe992..87978d5 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -175,7 +175,9 @@ public:
     void testSharedFormulaWrappedRefsXLS();
     void testSharedFormulaBIFF5();
     void testSharedFormulaXLSB();
+#if 0
     void testSharedFormulaXLS();
+#endif
     void testExternalRefCacheXLSX();
     void testExternalRefCacheODS();
     void testHybridSharedStringODS();
@@ -260,7 +262,9 @@ public:
     CPPUNIT_TEST(testSharedFormulaWrappedRefsXLS);
     CPPUNIT_TEST(testSharedFormulaBIFF5);
     CPPUNIT_TEST(testSharedFormulaXLSB);
+#if 0
     CPPUNIT_TEST(testSharedFormulaXLS);
+#endif
     CPPUNIT_TEST(testExternalRefCacheXLSX);
     CPPUNIT_TEST(testExternalRefCacheODS);
     CPPUNIT_TEST(testHybridSharedStringODS);
@@ -2604,6 +2608,8 @@ void ScFiltersTest::testSharedFormulaXLSB()
     xDocSh->DoClose();
 }
 
+#if 0
+
 void ScFiltersTest::testSharedFormulaXLS()
 {
     {
@@ -2660,6 +2666,8 @@ void ScFiltersTest::testSharedFormulaXLS()
     }
 }
 
+#endif
+
 void ScFiltersTest::testExternalRefCacheXLSX()
 {
     ScDocShellRef xDocSh = loadDoc("external-refs.", XLSX);