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

[Stephan Bergmann]

 sccomp/qa/unit/SwarmSolverTest.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 495d25bf653f3e0752982a889443b02fc374b0ed
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 20 17:22:41 2017 +0100

    CppunitTest_swarm_solver_test also consistently fails for UBSan build
    
    ...at least for my local one, with
    
    > /data/sbergman/lo-san/core/sccomp/qa/unit/SwarmSolverTest.cxx:387:(anonymous namespace)::SwarmSolverTest::testMultipleVariables
    > double equality assertion failed
    > - Expected: 0
    > - Actual  : 1
    > - Delta   : 1e-05
    
    so disable that part unconditionally for now.
    
    Change-Id: Id8c091781baf4381696e2a8f0501df1f3f83724f
    Reviewed-on: https://gerrit.libreoffice.org/44977
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/sccomp/qa/unit/SwarmSolverTest.cxx b/sccomp/qa/unit/SwarmSolverTest.cxx
index 18553471ba19..fd1bac2d0090 100644
--- a/sccomp/qa/unit/SwarmSolverTest.cxx
+++ b/sccomp/qa/unit/SwarmSolverTest.cxx
@@ -382,8 +382,8 @@ void SwarmSolverTest::testMultipleVariables()
     uno::Sequence<double> aSolution = xSolver->getSolution();
 
     CPPUNIT_ASSERT_EQUAL(aVariables.getLength(), aSolution.getLength());
-#ifndef _WIN32
-    // Disable on windows for now, needs algorithm stability improvements
+#if 0
+    // Disable for now, needs algorithm stability improvements
     CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, aSolution[0], 1E-5);
     CPPUNIT_ASSERT_DOUBLES_EQUAL(3.0, aSolution[1], 1E-5);
     CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, aSolution[2], 1E-5);