From 20c99e82173bed9e4e0013ec45c0b2b3b80b65d5 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 7 Oct 2013 13:27:23 +0200 Subject: [PATCH] tools/perf/build: Harmonize the style of the feature testcases The various testcases used different styles, which was not really visible as long as they hid in feature-tests.mak. Now that they are out in the open make them prettier. ( Also delete the leftover, empty feature-tests.mak file. ) Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Namhyung Kim Cc: David Ahern Cc: Jiri Olsa Link: http://lkml.kernel.org/n/tip-drDWk8xltndjdsespzjbhu6w@git.kernel.org Signed-off-by: Ingo Molnar --- tools/perf/config/feature-checks/test-backtrace.c | 1 - tools/perf/config/feature-checks/test-cplus-demangle.c | 1 - tools/perf/config/feature-checks/test-dwarf.c | 1 + tools/perf/config/feature-checks/test-glibc.c | 2 +- tools/perf/config/feature-checks/test-libaudit.c | 1 + tools/perf/config/feature-checks/test-libbfd.c | 1 - tools/perf/config/feature-checks/test-libelf-getphdrnum.c | 3 ++- tools/perf/config/feature-checks/test-libelf-mmap.c | 3 ++- tools/perf/config/feature-checks/test-libelf.c | 1 + tools/perf/config/feature-checks/test-libnuma.c | 1 + tools/perf/config/feature-checks/test-libpython.c | 3 ++- tools/perf/config/feature-tests.mak | 2 -- 12 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 tools/perf/config/feature-tests.mak diff --git a/tools/perf/config/feature-checks/test-backtrace.c b/tools/perf/config/feature-checks/test-backtrace.c index 5b33bcf12c27..7124aa1dc8fb 100644 --- a/tools/perf/config/feature-checks/test-backtrace.c +++ b/tools/perf/config/feature-checks/test-backtrace.c @@ -11,4 +11,3 @@ int main(void) return 0; } - diff --git a/tools/perf/config/feature-checks/test-cplus-demangle.c b/tools/perf/config/feature-checks/test-cplus-demangle.c index ab29f80570af..610c686e0009 100644 --- a/tools/perf/config/feature-checks/test-cplus-demangle.c +++ b/tools/perf/config/feature-checks/test-cplus-demangle.c @@ -12,4 +12,3 @@ int main(void) return 0; } - diff --git a/tools/perf/config/feature-checks/test-dwarf.c b/tools/perf/config/feature-checks/test-dwarf.c index 783dfcd9a5c4..3fc1801ce4a9 100644 --- a/tools/perf/config/feature-checks/test-dwarf.c +++ b/tools/perf/config/feature-checks/test-dwarf.c @@ -5,5 +5,6 @@ int main(void) { Dwarf *dbg = dwarf_begin(0, DWARF_C_READ); + return (long)dbg; } diff --git a/tools/perf/config/feature-checks/test-glibc.c b/tools/perf/config/feature-checks/test-glibc.c index 13c66a58f2ec..b0820345cd98 100644 --- a/tools/perf/config/feature-checks/test-glibc.c +++ b/tools/perf/config/feature-checks/test-glibc.c @@ -3,6 +3,6 @@ int main(void) { const char *version = gnu_get_libc_version(); + return (long)version; } - diff --git a/tools/perf/config/feature-checks/test-libaudit.c b/tools/perf/config/feature-checks/test-libaudit.c index f7e791efa6d1..afc019f08641 100644 --- a/tools/perf/config/feature-checks/test-libaudit.c +++ b/tools/perf/config/feature-checks/test-libaudit.c @@ -5,5 +5,6 @@ extern int printf(const char *format, ...); int main(void) { printf("error message: %s\n", audit_errno_to_name(0)); + return audit_open(); } diff --git a/tools/perf/config/feature-checks/test-libbfd.c b/tools/perf/config/feature-checks/test-libbfd.c index 1886c78c30e7..24059907e990 100644 --- a/tools/perf/config/feature-checks/test-libbfd.c +++ b/tools/perf/config/feature-checks/test-libbfd.c @@ -13,4 +13,3 @@ int main(void) return 0; } - diff --git a/tools/perf/config/feature-checks/test-libelf-getphdrnum.c b/tools/perf/config/feature-checks/test-libelf-getphdrnum.c index 58eca5332520..d710459306c3 100644 --- a/tools/perf/config/feature-checks/test-libelf-getphdrnum.c +++ b/tools/perf/config/feature-checks/test-libelf-getphdrnum.c @@ -1,7 +1,8 @@ #include -# + int main(void) { size_t dst; + return elf_getphdrnum(0, &dst); } diff --git a/tools/perf/config/feature-checks/test-libelf-mmap.c b/tools/perf/config/feature-checks/test-libelf-mmap.c index 1c648159c705..564427d7ef18 100644 --- a/tools/perf/config/feature-checks/test-libelf-mmap.c +++ b/tools/perf/config/feature-checks/test-libelf-mmap.c @@ -1,7 +1,8 @@ #include -# + int main(void) { Elf *elf = elf_begin(0, ELF_C_READ_MMAP, 0); + return (long)elf; } diff --git a/tools/perf/config/feature-checks/test-libelf.c b/tools/perf/config/feature-checks/test-libelf.c index 1a08f9717344..08db322d8957 100644 --- a/tools/perf/config/feature-checks/test-libelf.c +++ b/tools/perf/config/feature-checks/test-libelf.c @@ -3,5 +3,6 @@ int main(void) { Elf *elf = elf_begin(0, ELF_C_READ, 0); + return (long)elf; } diff --git a/tools/perf/config/feature-checks/test-libnuma.c b/tools/perf/config/feature-checks/test-libnuma.c index 70510a923e5a..4763d9cd587d 100644 --- a/tools/perf/config/feature-checks/test-libnuma.c +++ b/tools/perf/config/feature-checks/test-libnuma.c @@ -4,5 +4,6 @@ int main(void) { numa_available(); + return 0; } diff --git a/tools/perf/config/feature-checks/test-libpython.c b/tools/perf/config/feature-checks/test-libpython.c index 72267972fa98..b24b28ad6324 100644 --- a/tools/perf/config/feature-checks/test-libpython.c +++ b/tools/perf/config/feature-checks/test-libpython.c @@ -1,7 +1,8 @@ #include -# + int main(void) { Py_Initialize(); + return 0; } diff --git a/tools/perf/config/feature-tests.mak b/tools/perf/config/feature-tests.mak deleted file mode 100644 index 139597f9cb07..000000000000 --- a/tools/perf/config/feature-tests.mak +++ /dev/null @@ -1,2 +0,0 @@ - - -- GitLab