From: Paul Moore <paul(a)paul-moore.com&gt; Add the ability to filter out tests based on the host system's ABI as determined by "uname -m". This allows the test to run successfully on aarch64, and likely many other non-x86 ABIs as well. Signed-off-by: Paul Moore <paul(a)paul-moore.com&gt; --- tests/Makefile | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 297c56a..5ab0785 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2,8 +2,16 @@ export CFLAGS+=-g -O0 -Wall -D_GNU_SOURCE DISTRO := $(shell ./os_detect) -MODE := $(shell [ $(shell uname -i) == "i386" ] && echo "32" || echo "64") - +MACHINE := $(shell uname -m) +# NOTE: this assumes that only i386 is 32-bit which is obviously wrong, but +# until we can test this on other 32-bit ABIs limit MODE=32 to i386 +ifeq ($(MACHINE),i386) +MODE := 32 +else +MODE := 64 +endif + +# all of the tests TESTS := \ exec_execve \ exec_name \ @@ -20,6 +28,11 @@ TESTS := \ syscall_socketcall \ user_msg +# apply any ABI restrictions to the tests +ifneq ($(MACHINE),$(filter i386 x86_64,$(MACHINE))) + TESTS := $(filter-out syscall_socketcall,$(TESTS)) +endif + .PHONY: all test clean all: