summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2016-06-19 23:43:35 +0000
committerEvgeny Vereshchagin <evvers@ya.ru>2016-06-19 23:47:46 +0000
commitb3d69149bd03b1b42ded4661bfd799778844e4c1 (patch)
treea0ec10cf0f20259f693b0585644b6c081559c1c0
parentb774852ae6442eb50ca6e098d19d486cbcc82a12 (diff)
tests: don't run test_get_process_cmdline_harder under valgrind
See https://github.com/systemd/systemd/pull/3555#issuecomment-226564908
-rw-r--r--src/test/test-process-util.c11
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;