[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/qa

Kohei Yoshida kohei.yoshida at collabora.com
Wed Oct 30 03:08:25 CET 2013


 sc/qa/unit/opencl-test.cxx |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit fd59f791aeb042fc3547c5c2ab52be59081720d3
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Tue Oct 29 22:06:34 2013 -0400

    We don't need this hack. This actually causes the test to crash....
    
    On many Windows build environments.
    
    Change-Id: Id025517363ec915ecdc311ba1c30b537d01808ae

diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index d65c835..9f20dc5 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -49,7 +49,7 @@ class ScOpenclTest
 public:
     ScOpenclTest();
     bool enableOpenCL();
-    void SetEnv();
+
     virtual void setUp();
     virtual void tearDown();
 
@@ -171,16 +171,6 @@ bool ScOpenclTest::load(const OUString &rFilter, const OUString &rURL,
         xDocShRef->DoClose();
     return bLoaded;
 }
-void ScOpenclTest::SetEnv()
-{
-    #ifdef WIN32
-        char *newpathfull  = (char *)malloc(1024);
-        newpathfull= "PATH=;C:\\Program Files (x86)\\AMD APP\\bin\\x86_64;";
-        putenv(newpathfull);
-    #else
-        return;
-    #endif
-}
 
 bool ScOpenclTest::enableOpenCL()
 {
@@ -1464,7 +1454,6 @@ ScOpenclTest::ScOpenclTest()
 void ScOpenclTest::setUp()
 {
     test::BootstrapFixture::setUp();
-    SetEnv();
     // This is a bit of a fudge, we do this to ensure that ScGlobals::ensure,
     // which is a private symbol to us, gets called
     m_xCalcComponent =


More information about the Libreoffice-commits mailing list