Merge pull request #3564 from evverx/valgrind-tests-fixes

tests: fix memory leak, don't run test_get_process_cmdline_harder under valgrind

1 files changed, 11 insertions, 0 deletions

diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index af2c9282d4..99c92780b8 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -26,6 +26,9 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#ifdef HAVE_VALGRIND_VALGRIND_H
+#include <valgrind/valgrind.h>
+#endif
 
 #include "alloc-util.h"
 #include "architecture.h"
@@ -164,6 +167,14 @@ static void test_get_process_cmdline_harder(void) {
         if (geteuid() != 0)
                 return;
 
+#ifdef HAVE_VALGRIND_VALGRIND_H
+        /* valgrind patches open(/proc//cmdline)
+         * so, test_get_process_cmdline_harder fails always
+         * See https://github.com/systemd/systemd/pull/3555#issuecomment-226564908 */
+        if (RUNNING_ON_VALGRIND)
+                return;
+#endif
+
         pid = fork();
         if (pid > 0) {
                 siginfo_t si;