diff options
Diffstat (limited to 'tools/build/feature')
| -rw-r--r-- | tools/build/feature/Makefile | 18 | ||||
| -rw-r--r-- | tools/build/feature/test-all.c | 19 | ||||
| -rw-r--r-- | tools/build/feature/test-get_current_dir_name.c | 11 | ||||
| -rw-r--r-- | tools/build/feature/test-libbpf-strings.c | 10 | ||||
| -rw-r--r-- | tools/build/feature/test-libslang-include-subdir.c | 7 |
5 files changed, 5 insertions, 60 deletions
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index b41a42818d8a..49b0add392b1 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -8,7 +8,6 @@ FILES= \ test-libdw.bin \ test-eventfd.bin \ test-fortify-source.bin \ - test-get_current_dir_name.bin \ test-glibc.bin \ test-gtk2.bin \ test-gtk2-infobar.bin \ @@ -34,7 +33,6 @@ FILES= \ test-libperl.bin \ test-libpython.bin \ test-libslang.bin \ - test-libslang-include-subdir.bin \ test-libtraceevent.bin \ test-libcpupower.bin \ test-libtracefs.bin \ @@ -58,7 +56,6 @@ FILES= \ test-lzma.bin \ test-bpf.bin \ test-libbpf.bin \ - test-libbpf-strings.bin \ test-get_cpuid.bin \ test-sdt.bin \ test-cxx.bin \ @@ -94,7 +91,7 @@ else # paths are used instead. ifdef CROSS_COMPILE ifeq ($(PKG_CONFIG_LIBDIR)$(PKG_CONFIG_PATH)$(PKG_CONFIG_SYSROOT_DIR),) - CROSS_ARCH = $(shell $(CC) -dumpmachine) + CROSS_ARCH = $(notdir $(CROSS_COMPILE:%-=%)) PKG_CONFIG_LIBDIR := /usr/local/$(CROSS_ARCH)/lib/pkgconfig/ PKG_CONFIG_LIBDIR := $(PKG_CONFIG_LIBDIR):/usr/local/lib/$(CROSS_ARCH)/pkgconfig/ PKG_CONFIG_LIBDIR := $(PKG_CONFIG_LIBDIR):/usr/lib/$(CROSS_ARCH)/pkgconfig/ @@ -147,9 +144,6 @@ $(OUTPUT)test-libelf.bin: $(OUTPUT)test-eventfd.bin: $(BUILD) -$(OUTPUT)test-get_current_dir_name.bin: - $(BUILD) - $(OUTPUT)test-glibc.bin: $(BUILD) @@ -234,9 +228,6 @@ $(OUTPUT)test-libunwind-debug-frame-aarch64.bin: $(OUTPUT)test-libslang.bin: $(BUILD) -lslang -$(OUTPUT)test-libslang-include-subdir.bin: - $(BUILD) -lslang - $(OUTPUT)test-libtraceevent.bin: $(BUILD) -ltraceevent @@ -316,10 +307,10 @@ $(OUTPUT)test-libcapstone.bin: $(BUILD) # -lcapstone provided by $(FEATURE_CHECK_LDFLAGS-libcapstone) $(OUTPUT)test-compile-32.bin: - $(CC) -m32 -o $@ test-compile.c + $(CC) -m32 -Wall -Werror -o $@ test-compile.c $(OUTPUT)test-compile-x32.bin: - $(CC) -mx32 -o $@ test-compile.c + $(CC) -mx32 -Wall -Werror -o $@ test-compile.c $(OUTPUT)test-zlib.bin: $(BUILD) -lz @@ -336,9 +327,6 @@ $(OUTPUT)test-bpf.bin: $(OUTPUT)test-libbpf.bin: $(BUILD) -lbpf -$(OUTPUT)test-libbpf-strings.bin: - $(BUILD) - $(OUTPUT)test-sdt.bin: $(BUILD) diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c index 4419fb4710bd..8a354b81417c 100644 --- a/tools/build/feature/test-all.c +++ b/tools/build/feature/test-all.c @@ -7,17 +7,13 @@ */ /* - * Quirk: Python and Perl headers cannot be in arbitrary places, so keep - * these 3 testcases at the top: + * Quirk: Python headers cannot be in arbitrary places, so keep this testcase at + * the top: */ #define main main_test_libpython # include "test-libpython.c" #undef main -#define main main_test_libperl -# include "test-libperl.c" -#undef main - #define main main_test_hello # include "test-hello.c" #undef main @@ -26,10 +22,6 @@ # include "test-libelf.c" #undef main -#define main main_test_get_current_dir_name -# include "test-get_current_dir_name.c" -#undef main - #define main main_test_gettid # include "test-gettid.c" #undef main @@ -154,17 +146,11 @@ # include "test-libtraceevent.c" #undef main -#define main main_test_libtracefs -# include "test-libtracefs.c" -#undef main - int main(int argc, char *argv[]) { main_test_libpython(); - main_test_libperl(); main_test_hello(); main_test_libelf(); - main_test_get_current_dir_name(); main_test_gettid(); main_test_glibc(); main_test_libdw(); @@ -192,7 +178,6 @@ int main(int argc, char *argv[]) main_test_reallocarray(); main_test_libzstd(); main_test_libtraceevent(); - main_test_libtracefs(); return 0; } diff --git a/tools/build/feature/test-get_current_dir_name.c b/tools/build/feature/test-get_current_dir_name.c deleted file mode 100644 index c3c201691b4f..000000000000 --- a/tools/build/feature/test-get_current_dir_name.c +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#define _GNU_SOURCE -#include <unistd.h> -#include <stdlib.h> - -int main(void) -{ - free(get_current_dir_name()); - return 0; -} -#undef _GNU_SOURCE diff --git a/tools/build/feature/test-libbpf-strings.c b/tools/build/feature/test-libbpf-strings.c deleted file mode 100644 index 83e6c45f5c85..000000000000 --- a/tools/build/feature/test-libbpf-strings.c +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <bpf/btf.h> - -int main(void) -{ - struct btf_dump_type_data_opts opts; - - opts.emit_strings = 0; - return opts.emit_strings; -} diff --git a/tools/build/feature/test-libslang-include-subdir.c b/tools/build/feature/test-libslang-include-subdir.c deleted file mode 100644 index 3ea47ec7590e..000000000000 --- a/tools/build/feature/test-libslang-include-subdir.c +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <slang/slang.h> - -int main(void) -{ - return SLsmg_init_smg(); -} |