perf tests: Fix thread map test for -F option

I hit a bug when running test suite without forking each test (-F
option):

  $ perf test -Fv
  ...
  34: Test thread map                                          :
  --- start ---
  FAILED tests/thread-map.c:24 wrong comm
  ---- end ----
  Test thread map: FAILED!

The reason was the process name wasn't 'perf' as expected by the test,
because other tests set the name as well.

Setting it explicitly now.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Nilay Vaish <nilayvaish@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1467113345-12669-3-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/thread-map.c b/tools/perf/tests/thread-map.c
index fccde848fe9c0d0d67f1d6081b7e09ed7fc05610..cee2a2cdc93353fc18915889bd32b9a43cad9c30 100644 (file)
--- a/tools/perf/tests/thread-map.c
+++ b/tools/perf/tests/thread-map.c
@@ -1,13 +1,20 @@
 #include <sys/types.h>
 #include <unistd.h>
+#include <sys/prctl.h>
 #include "tests.h"
 #include "thread_map.h"
 #include "debug.h"
 
+#define NAME   (const char *) "perf"
+#define NAMEUL (unsigned long) NAME
+
 int test__thread_map(int subtest __maybe_unused)
 {
        struct thread_map *map;
 
+       TEST_ASSERT_VAL("failed to set process name",
+                       !prctl(PR_SET_NAME, NAMEUL, 0, 0, 0));
+
        /* test map on current pid */
        map = thread_map__new_by_pid(getpid());
        TEST_ASSERT_VAL("failed to alloc map", map);
@@ -19,7 +26,7 @@ int test__thread_map(int subtest __maybe_unused)
                        thread_map__pid(map, 0) == getpid());
        TEST_ASSERT_VAL("wrong comm",
                        thread_map__comm(map, 0) &&
-                       !strcmp(thread_map__comm(map, 0), "perf"));
+                       !strcmp(thread_map__comm(map, 0), NAME));
        TEST_ASSERT_VAL("wrong refcnt",
                        atomic_read(&map->refcnt) == 1);
        thread_map__put(map);
@@ -51,7 +58,7 @@ static int process_event(struct perf_tool *tool __maybe_unused,
 
        TEST_ASSERT_VAL("wrong nr",   map->nr == 1);
        TEST_ASSERT_VAL("wrong pid",  map->entries[0].pid == (u64) getpid());
-       TEST_ASSERT_VAL("wrong comm", !strcmp(map->entries[0].comm, "perf"));
+       TEST_ASSERT_VAL("wrong comm", !strcmp(map->entries[0].comm, NAME));
 
        threads = thread_map__new_event(&event->thread_map);
        TEST_ASSERT_VAL("failed to alloc map", threads);
@@ -61,7 +68,7 @@ static int process_event(struct perf_tool *tool __maybe_unused,
                        thread_map__pid(threads, 0) == getpid());
        TEST_ASSERT_VAL("wrong comm",
                        thread_map__comm(threads, 0) &&
-                       !strcmp(thread_map__comm(threads, 0), "perf"));
+                       !strcmp(thread_map__comm(threads, 0), NAME));
        TEST_ASSERT_VAL("wrong refcnt",
                        atomic_read(&threads->refcnt) == 1);
        thread_map__put(threads);
@@ -72,6 +79,9 @@ int test__thread_map_synthesize(int subtest __maybe_unused)
 {
        struct thread_map *threads;
 
+       TEST_ASSERT_VAL("failed to set process name",
+                       !prctl(PR_SET_NAME, NAMEUL, 0, 0, 0));
+
        /* test map on current pid */
        threads = thread_map__new_by_pid(getpid());
        TEST_ASSERT_VAL("failed to alloc map", threads);