diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 2535c4c..e5f53c7 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -60,6 +60,7 @@ #include #include #include +#include #ifdef UNX #if defined( MACOSX ) @@ -469,7 +470,7 @@ public: OString temp_file_name = OUStringToOString(OUString( parameters_[1]), osl_getThreadTextEncoding()); std::ifstream file(temp_file_name.getStr()); - + file.ignore(std::numeric_limits::max(), '\n'); CPPUNIT_ASSERT_MESSAGE ( "I/O error, cannot open child environment file", @@ -561,8 +562,13 @@ public: #endif bool different_env_size_equals = (different_child_env_vars.size() == different_env_vars.size()); - bool different_env_content_equals = + fprintf(stderr, "different_child_env_vars.size() %d\n", different_child_env_vars.size());fflush(stderr); + fprintf(stderr, "different_env_vars.size() %d\n", different_env_vars.size());fflush(stderr); + bool different_env_content_equals = false; + if (different_child_env_vars.size() == different_env_vars.size()) { + different_env_content_equals = std::equal(different_env_vars.begin(), different_env_vars.end(), different_child_env_vars.begin()); + } return (common_env_size_equals && common_env_content_equals && different_env_size_equals && different_env_content_equals);