[1/2] Revert "selftests/x86: Recurse into subdirectories"

Commit Message

Jarkko Sakkinen March 20, 2020, 5:47 p.m. UTC

This reverts commit 565ceeb112045102d62493efb951e237d030e7e1.
---
 tools/testing/selftests/x86/Makefile | 44 ----------------------------
 1 file changed, 44 deletions(-)

Patch

diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile
index dee6dadeba61..5d49bfec1e9a 100644
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@ -10,8 +10,6 @@  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 \
@@ -61,48 +59,6 @@  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))))