---

yaml --- r: 349916 b: refs/heads/master c: f8ebb0c h: refs/heads/master v: v3
git-mirror · Jan 24, 2013 · ad491b4 · ad491b4
1 parent 55217d0
commit ad491b4
Show file tree

Hide file tree

Showing 5 changed files with 509 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66f97ed3ac44c24958171bbc5cc04896147752b7
+refs/heads/master: f8ebb0cdf30fec2c2a5a364cdda8e6758a44026c
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
@@ -487,6 +487,7 @@ LIB_OBJS += $(OUTPUT)tests/rdpmc.o
 LIB_OBJS += $(OUTPUT)tests/evsel-roundtrip-name.o
 LIB_OBJS += $(OUTPUT)tests/evsel-tp-sched.o
 LIB_OBJS += $(OUTPUT)tests/pmu.o
+LIB_OBJS += $(OUTPUT)tests/hists_link.o
 
 BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o
 BUILTIN_OBJS += $(OUTPUT)builtin-bench.o

diff --git a/trunk/tools/perf/tests/builtin-test.c b/trunk/tools/perf/tests/builtin-test.c
@@ -68,6 +68,10 @@ static struct test {
 		.desc = "struct perf_event_attr setup",
 		.func = test__attr,
 	},
+	{
+		.desc = "Test matching and linking mutliple hists",
+		.func = test__hists_link,
+	},
 	{
 		.func = NULL,
 	},