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

[Douglas Mencken]

 sal/qa/osl/process/osl_process.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 56c2802e1c0de4895856aad54262ec759abf1ab9
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Wed Jul 30 06:10:06 2014 -0400

    sal_osl_process: fix "Parent and child environment not equal" for OSX <10.6
    
    It fails with "assertion failed":
    - Expression: compare_environments() [osl_process.cxx:370]
    - Expression: compare_merged_environments(different_child_env_vars) [osl_process.cxx:428]
    
    Just disable it (yet) for OSX <10.6 as it's already done for Windows.
    
    Change-Id: I88e838481a25ee7e977512e33e23afa2b9d394ff
    Reviewed-on: https://gerrit.libreoffice.org/10641
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 5a79ceb..14c7bf5 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -465,8 +465,8 @@ public:
     }
 
     CPPUNIT_TEST_SUITE(Test_osl_executeProcess);
-    //TODO: Repair these under windows.
-#ifndef WNT
+    //TODO: Repair these (at least under Windows)
+#if !defined(WNT) && !(defined(MACOSX) && (MACOSX_SDK_VERSION < 1060))
     CPPUNIT_TEST(osl_execProc_parent_equals_child_environment);
     CPPUNIT_TEST(osl_execProc_merged_child_environment);
 #endif