Skip to contentSkip to conversation

perf tests: Don't fail if a matching vmlinux isn' t found, skip that test

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jan 25, 2013 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  531f67bb9ff4069b629762dd5a560e23fc4c5478
Gitweb:     http://git.kernel.org/tip/531f67bb9ff4069b629762dd5a560e23fc4c5478
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 19 Dec 2012 11:11:59 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 24 Jan 2013 16:40:14 -0300

perf tests: Don't fail if a matching vmlinux isn't found, skip that test

Now that Jiri introduced TEST_SKIP, don't fail on the first test, just skip it.

Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
---
 tools/perf/tests/vmlinux-kallsyms.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/tests/vmlinux-kallsyms.c +2 -1
index 0d1cdbe..a1a8442 100644
@@ -101,7 +101,8 @@ int test__vmlinux_matches_kallsyms(void)
 	 */
 	if (machine__load_vmlinux_path(&vmlinux, type,
 				       vmlinux_matches_kallsyms_filter) <= 0) {
-		pr_debug("machine__load_vmlinux_path ");
+		pr_debug("Couldn't find a vmlinux that matches the kernel running on this machine, skipping test\n");
+		err = TEST_SKIP;
 		goto out;
 	}