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

[Tor Lillqvist]

 sc/Module_sc.mk            |   10 +++++++---
 sc/qa/unit/opencl-test.cxx |    2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 62fd1cfb7eb64ac48d588b667e325c6d80528e33
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Nov 17 09:05:20 2013 +0200

    WaE: unused variables
    
    Change-Id: I81cdd8d295e07d13b6013e1a64f7c7327f5c54c2

diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 238cefd..0cbf365 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -767,6 +767,8 @@ void ScOpenclTest::testMathFormulaRandom()
         double fLibre = pDoc->GetValue(ScAddress(0,i,0));
         double fExcel = pDocRes->GetValue(ScAddress(0,i,0));
         //because the random numbers will always change,so give the test "true"
+        (void) fLibre;
+        (void) fExcel;
         CPPUNIT_ASSERT(true);
     }
     xDocSh->DoClose();
commit 51cf9b09542d795c40743e14fa009316286654b2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Nov 17 09:04:44 2013 +0200

    CppunitTest_sc_opencl_test doesn't crash on OS X
    
    Change-Id: I401115dc23306525917c968b753e70643ebe069d

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index f27e104..a60506c 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -50,13 +50,17 @@ $(eval $(call gb_Module_add_targets,sc,\
 
 endif
 
-# Disabled because fails on too many machines in
-# the OpenCL compiler
-# CppunitTest_sc_opencl_test
+# The sc_opencl_test disabled for other OSes than OS X at the moment
+# because it fails on many Linux machines in the OpenCL compiler. OS X
+# has a different (?) OpenCL compiler implementation than the one
+# which fails.
+#
 $(eval $(call gb_Module_add_check_targets,sc,\
     CppunitTest_sc_ucalc \
     CppunitTest_sc_filters_test \
     CppunitTest_sc_rangelst_test \
+    $(if $(filter $(OS),MACOSX), \
+        CppunitTest_sc_opencl_test) \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,sc, \