aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorWang Nan <wangnan0@huawei.com>2016-01-11 08:48:03 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-01-11 17:22:22 -0500
commitb0500c169b4069e40f03391c7280cd6eaf849e49 (patch)
tree4005cfdb1d42e84716baef1bf024d4e0b5ad7de7 /tools
parent71b3ee7e65ffb48135d875d9c36e3183b9ecffeb (diff)
perf test: Reset err after using it hold errcode in hist testcases
All hists test cases forget to reset err after using it to hold an error code. If error occure in setup_fake_machine() it incorrectly return TEST_OK. This patch fixes it. Suggested-and-Acked-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Wang Nan <wangnan0@huawei.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: Zefan Li <lizefan@huawei.com> Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1452520124-2073-13-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/tests/hists_cumulate.c1
-rw-r--r--tools/perf/tests/hists_filter.c1
-rw-r--r--tools/perf/tests/hists_link.c1
-rw-r--r--tools/perf/tests/hists_output.c1
4 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/tests/hists_cumulate.c b/tools/perf/tests/hists_cumulate.c
index e36089212061..5e6a86e50fb9 100644
--- a/tools/perf/tests/hists_cumulate.c
+++ b/tools/perf/tests/hists_cumulate.c
@@ -706,6 +706,7 @@ int test__hists_cumulate(int subtest __maybe_unused)
706 err = parse_events(evlist, "cpu-clock", NULL); 706 err = parse_events(evlist, "cpu-clock", NULL);
707 if (err) 707 if (err)
708 goto out; 708 goto out;
709 err = TEST_FAIL;
709 710
710 machines__init(&machines); 711 machines__init(&machines);
711 712
diff --git a/tools/perf/tests/hists_filter.c b/tools/perf/tests/hists_filter.c
index 2a784befd9ce..351a42463444 100644
--- a/tools/perf/tests/hists_filter.c
+++ b/tools/perf/tests/hists_filter.c
@@ -120,6 +120,7 @@ int test__hists_filter(int subtest __maybe_unused)
120 err = parse_events(evlist, "task-clock", NULL); 120 err = parse_events(evlist, "task-clock", NULL);
121 if (err) 121 if (err)
122 goto out; 122 goto out;
123 err = TEST_FAIL;
123 124
124 /* default sort order (comm,dso,sym) will be used */ 125 /* default sort order (comm,dso,sym) will be used */
125 if (setup_sorting(NULL) < 0) 126 if (setup_sorting(NULL) < 0)
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index c764d69ac6ef..64b257d8d557 100644
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -293,6 +293,7 @@ int test__hists_link(int subtest __maybe_unused)
293 if (err) 293 if (err)
294 goto out; 294 goto out;
295 295
296 err = TEST_FAIL;
296 /* default sort order (comm,dso,sym) will be used */ 297 /* default sort order (comm,dso,sym) will be used */
297 if (setup_sorting(NULL) < 0) 298 if (setup_sorting(NULL) < 0)
298 goto out; 299 goto out;
diff --git a/tools/perf/tests/hists_output.c b/tools/perf/tests/hists_output.c
index ebe6cd485b5d..b231265148d8 100644
--- a/tools/perf/tests/hists_output.c
+++ b/tools/perf/tests/hists_output.c
@@ -597,6 +597,7 @@ int test__hists_output(int subtest __maybe_unused)
597 err = parse_events(evlist, "cpu-clock", NULL); 597 err = parse_events(evlist, "cpu-clock", NULL);
598 if (err) 598 if (err)
599 goto out; 599 goto out;
600 err = TEST_FAIL;
600 601
601 machines__init(&machines); 602 machines__init(&machines);
602 603