lkml.org 
[lkml]   [2020]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v28 13/22] selftests/x86: Recurse into subdirectories
    Date
    Recurse into a list of subdirectories defined by SUBDIRS when running
    x86 selftests. Override run_tests, install, emit_tests and clean
    targets to implement this behaviour.

    A possible alternative would be to add "x86/sgx" to TARGETS. However,
    this would be problematic because detecting 64-bit build would have
    to duplicated.

    The implementation is derived from the makefiles of powerpc and sparc64
    selftests.

    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    ---
    tools/testing/selftests/x86/Makefile | 44 ++++++++++++++++++++++++++++
    1 file changed, 44 insertions(+)

    diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile
    index 5d49bfec1e9a..dee6dadeba61 100644
    --- a/tools/testing/selftests/x86/Makefile
    +++ b/tools/testing/selftests/x86/Makefile
    @@ -10,6 +10,8 @@ CAN_BUILD_I386 := $(shell ./check_cc.sh $(CC) trivial_32bit_program.c -m32)
    CAN_BUILD_X86_64 := $(shell ./check_cc.sh $(CC) trivial_64bit_program.c)
    CAN_BUILD_WITH_NOPIE := $(shell ./check_cc.sh $(CC) trivial_program.c -no-pie)

    +SUBDIRS := sgx
    +
    TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt test_mremap_vdso \
    check_initial_reg_state sigreturn iopl ioperm \
    protection_keys test_vdso test_vsyscall mov_ss_trap \
    @@ -59,6 +61,48 @@ endif

    ifeq ($(CAN_BUILD_X86_64),1)
    all: all_64
    + @for DIR in $(SUBDIRS); do \
    + BUILD_TARGET=$(OUTPUT)/$$DIR; \
    + mkdir $$BUILD_TARGET -p; \
    + make OUTPUT=$$BUILD_TARGET -C $$DIR $@; \
    + done
    +
    +DEFAULT_RUN_TESTS := $(RUN_TESTS)
    +override define RUN_TESTS
    + $(DEFAULT_RUN_TESTS)
    + @for TARGET in $(SUBDIRS); do \
    + BUILD_TARGET=$(OUTPUT)/$$TARGET; \
    + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests; \
    + done;
    +endef
    +
    +DEFAULT_INSTALL_RULE := $(INSTALL_RULE)
    +override define INSTALL_RULE
    + $(DEFAULT_INSTALL_RULE)
    + @for TARGET in $(SUBDIRS); do \
    + BUILD_TARGET=$(OUTPUT)/$$TARGET; \
    + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install; \
    + done;
    +endef
    +
    +DEFAULT_EMIT_TESTS := $(EMIT_TESTS)
    +override define EMIT_TESTS
    + $(DEFAULT_EMIT_TESTS)
    + @for TARGET in $(SUBDIRS); do \
    + BUILD_TARGET=$(OUTPUT)/$$TARGET; \
    + $(MAKE) OUTPUT=$$BUILD_TARGET -s -C $$TARGET emit_tests; \
    + done;
    +endef
    +
    +DEFAULT_CLEAN := $(CLEAN)
    +override define CLEAN
    + $(DEFAULT_CLEAN)
    + @for TARGET in $(SUBDIRS); do \
    + BUILD_TARGET=$(OUTPUT)/$$TARGET; \
    + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean; \
    + done;
    +endef
    +
    TEST_PROGS += $(BINARIES_64)
    EXTRA_CFLAGS += -DCAN_BUILD_64
    $(foreach t,$(TARGETS_C_64BIT_ALL),$(eval $(call gen-target-rule-64,$(t))))
    --
    2.25.0
    \
     
     \ /
      Last update: 2020-03-04 00:39    [W:6.955 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site