[Libreoffice-commits] .: sal/qa

[Caolán McNamara]

 sal/qa/osl/process/osl_process.cxx |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

New commits:
commit 923ae117a7bdb4ecfde25599700372098945e9b1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 24 16:08:50 2011 +0000

    add some debug code to help find failures

diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 5d16e3f..554c66b 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -475,17 +475,31 @@ public:
         string_container_t parent_env;
         read_parent_environment(&parent_env);
 
+#if OSL_DEBUG_LEVEL > 1
+        for (string_container_t::const_iterator iter = parent_env.begin(), end = parent_env.end(); iter != end; ++iter)
+            std::cerr << "initially parent env: " << *iter << std::endl;
+#endif
+
         //remove the environment variables that we have changed
         //in the child environment from the read parent environment
         parent_env.erase(
             std::remove_if(parent_env.begin(), parent_env.end(), exclude(different_env_vars)),
             parent_env.end());
 
+#if OSL_DEBUG_LEVEL > 1
+        for (string_container_t::const_iterator iter = parent_env.begin(), end = parent_env.end(); iter != end; ++iter)
+            std::cerr << "stripped parent env: " << *iter << std::endl;
+#endif
+
         //read the child environment and exclude the variables that
         //are different
         string_container_t child_env;
         read_child_environment(&child_env);
 
+#if OSL_DEBUG_LEVEL > 1
+        for (string_container_t::const_iterator iter = child_env.begin(), end = child_env.end(); iter != end; ++iter)
+            std::cerr << "initial child env: " << *iter << std::endl;
+#endif
         //partition the child environment into the variables that
         //are different to the parent environment (they come first)
         //and the variables that should be equal between parent
@@ -496,6 +510,11 @@ public:
         string_container_t different_child_env_vars(child_env.begin(), iter_logical_end);
         child_env.erase(child_env.begin(), iter_logical_end);
 
+#if OSL_DEBUG_LEVEL > 1
+        for (string_container_t::const_iterator iter = child_env.begin(), end = child_env.end(); iter != end; ++iter)
+            std::cerr << "stripped child env: " << *iter << std::endl;
+#endif
+
         bool common_env_size_equals    = (parent_env.size() == child_env.size());
         bool common_env_content_equals = std::equal(child_env.begin(), child_env.end(), parent_env.begin());