6 files changed, 46 insertions, 11 deletions

diff --git a/tools/perf/arch/x86/Build b/tools/perf/arch/x86/Build
index 41bf61da476a..db52fa22d3a1 100644
--- a/tools/perf/arch/x86/Build
+++ b/tools/perf/arch/x86/Build
@@ -1,2 +1,2 @@
 libperf-y += util/
-libperf-$(CONFIG_DWARF_UNWIND) += tests/
+libperf-y += tests/
diff --git a/tools/perf/arch/x86/include/arch-tests.h b/tools/perf/arch/x86/include/arch-tests.h
new file mode 100644
index 000000000000..4bd41d8e1ca4
--- /dev/null
+++ b/tools/perf/arch/x86/include/arch-tests.h
@@ -0,0 +1,6 @@
+#ifndef ARCH_TESTS_H
+#define ARCH_TESTS_H
+
+extern struct test arch_tests[];
+
+#endif
diff --git a/tools/perf/arch/x86/tests/Build b/tools/perf/arch/x86/tests/Build
index b30eff9bcc83..d827ef384b33 100644
--- a/tools/perf/arch/x86/tests/Build
+++ b/tools/perf/arch/x86/tests/Build
@@ -1,2 +1,4 @@
-libperf-y += regs_load.o
-libperf-y += dwarf-unwind.o
+libperf-$(CONFIG_DWARF_UNWIND) += regs_load.o
+libperf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
+
+libperf-y += arch-tests.o
diff --git a/tools/perf/arch/x86/tests/arch-tests.c b/tools/perf/arch/x86/tests/arch-tests.c
new file mode 100644
index 000000000000..fca9eb9d39a2
--- /dev/null
+++ b/tools/perf/arch/x86/tests/arch-tests.c
@@ -0,0 +1,10 @@
+#include <string.h>
+#include "tests/tests.h"
+#include "arch-tests.h"
+
+struct test arch_tests[] = {
+        {
+                .func = NULL,
+        },
+
+};
diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index d9bf51dc8cf5..2b6c1bf13456 100644
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -14,10 +14,13 @@
 #include "parse-options.h"
 #include "symbol.h"
 
-static struct test {
-        const char *desc;
-        int (*func)(void);
-} tests[] = {
+struct test __weak arch_tests[] = {
+        {
+                .func = NULL,
+        },
+};
+
+static struct test generic_tests[] = {
         {
                 .desc = "vmlinux symtab matches kallsyms",
                 .func = test__vmlinux_matches_kallsyms,
@@ -195,6 +198,11 @@ static struct test {
         },
 };
 
+static struct test *tests[] = {
+        generic_tests,
+        arch_tests,
+};
+
 static bool perf_test__matches(struct test *test, int curr, int argc, const char *argv[])
 {
         int i;
@@ -249,22 +257,25 @@ static int run_test(struct test *test)
         return err;
 }
 
-#define for_each_test(t)         for (t = &tests[0]; t->func; t++)
+#define for_each_test(j, t)                                     \
+        for (j = 0; j < ARRAY_SIZE(tests); j++) \
+                for (t = &tests[j][0]; t->func; t++)
 
 static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
 {
         struct test *t;
+        unsigned int j;
         int i = 0;
         int width = 0;
 
-        for_each_test(t) {
+        for_each_test(j, t) {
                 int len = strlen(t->desc);
 
                 if (width < len)
                         width = len;
         }
 
-        for_each_test(t) {
+        for_each_test(j, t) {
                 int curr = i++, err;
 
                 if (!perf_test__matches(t, curr, argc, argv))
@@ -300,10 +311,11 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist)
 
 static int perf_test__list(int argc, const char **argv)
 {
+        unsigned int j;
         struct test *t;
         int i = 0;
 
-        for_each_test(t) {
+        for_each_test(j, t) {
                 if (argc > 1 && !strstr(t->desc, argv[1]))
                         continue;
 
diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index 0b3549672c16..b1cb1c081e3c 100644
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -24,6 +24,11 @@ enum {
         TEST_SKIP = -2,
 };
 
+struct test {
+        const char *desc;
+        int (*func)(void);
+};
+
 /* Tests */
 int test__vmlinux_matches_kallsyms(void);
 int test__openat_syscall_event(void);