Kaydet (Commit) 56c2802e authored tarafından Douglas Mencken's avatar Douglas Mencken Kaydeden (comit) Stephan Bergmann

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/10641Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
Tested-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 45db9b09
...@@ -465,8 +465,8 @@ public: ...@@ -465,8 +465,8 @@ public:
} }
CPPUNIT_TEST_SUITE(Test_osl_executeProcess); CPPUNIT_TEST_SUITE(Test_osl_executeProcess);
//TODO: Repair these under windows. //TODO: Repair these (at least under Windows)
#ifndef WNT #if !defined(WNT) && !(defined(MACOSX) && (MACOSX_SDK_VERSION < 1060))
CPPUNIT_TEST(osl_execProc_parent_equals_child_environment); CPPUNIT_TEST(osl_execProc_parent_equals_child_environment);
CPPUNIT_TEST(osl_execProc_merged_child_environment); CPPUNIT_TEST(osl_execProc_merged_child_environment);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment