Kaydet (Commit) 69f8a4cc authored tarafından Caolán McNamara's avatar Caolán McNamara

disable environment equality test under valgrind

Change-Id: I9e0e06331f134fe89c9942f93b7546b0e67bb821
üst 43074739
...@@ -19,6 +19,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\ ...@@ -19,6 +19,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
$(eval $(call gb_CppunitTest_use_externals,sal_osl_process,\
valgrind \
))
$(eval $(call gb_CppunitTest_use_executable,sal_osl_process,osl_process_child)) $(eval $(call gb_CppunitTest_use_executable,sal_osl_process,osl_process_child))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -37,6 +37,10 @@ ...@@ -37,6 +37,10 @@
#include <osl/module.hxx> #include <osl/module.hxx>
#include <sal/macros.h> #include <sal/macros.h>
#if defined HAVE_VALGRIND_HEADERS
#include <valgrind/memcheck.h>
#endif
#if ( defined WNT ) // Windows #if ( defined WNT ) // Windows
# include <windows.h> # include <windows.h>
# include <tchar.h> # include <tchar.h>
...@@ -363,6 +367,12 @@ public: ...@@ -363,6 +367,12 @@ public:
osl_freeProcessHandle(process); osl_freeProcessHandle(process);
#if defined HAVE_VALGRIND_HEADERS
//valgrind makes these not match
if (RUNNING_ON_VALGRIND)
return;
#endif
CPPUNIT_ASSERT_MESSAGE CPPUNIT_ASSERT_MESSAGE
( (
"Parent and child environment not equal", "Parent and child environment not equal",
...@@ -421,6 +431,12 @@ public: ...@@ -421,6 +431,12 @@ public:
different_child_env_vars.push_back(ENV2); different_child_env_vars.push_back(ENV2);
different_child_env_vars.push_back(ENV4); different_child_env_vars.push_back(ENV4);
#if defined HAVE_VALGRIND_HEADERS
//valgrind makes these not match
if (RUNNING_ON_VALGRIND)
return;
#endif
CPPUNIT_ASSERT_MESSAGE CPPUNIT_ASSERT_MESSAGE
( (
"osl_execProc_merged_child_environment", "osl_execProc_merged_child_environment",
......
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