From patchwork Sun Aug 18 16:44:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 11099689 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7DD01112C for ; Sun, 18 Aug 2019 16:44:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D2CD28511 for ; Sun, 18 Aug 2019 16:44:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 616A62850F; Sun, 18 Aug 2019 16:44:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C46A2850F for ; Sun, 18 Aug 2019 16:44:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726911AbfHRQoj (ORCPT ); Sun, 18 Aug 2019 12:44:39 -0400 Received: from mga01.intel.com ([192.55.52.88]:48741 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726097AbfHRQoj (ORCPT ); Sun, 18 Aug 2019 12:44:39 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Aug 2019 09:44:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,401,1559545200"; d="scan'208";a="179217048" Received: from hjamouss-mobl.ger.corp.intel.com (HELO localhost) ([10.252.39.36]) by fmsmga007.fm.intel.com with ESMTP; 18 Aug 2019 09:44:38 -0700 From: Jarkko Sakkinen To: linux-sgx@vger.kernel.org Cc: Jarkko Sakkinen Subject: [PATCH v2 6/7] selftests/x86: Revert SGX changes Date: Sun, 18 Aug 2019 19:44:06 +0300 Message-Id: <20190818164408.31808-7-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190818164408.31808-1-jarkko.sakkinen@linux.intel.com> References: <20190818164408.31808-1-jarkko.sakkinen@linux.intel.com> MIME-Version: 1.0 Sender: linux-sgx-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sgx@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The SGX changes are incorrect in the makefile but the more important reason to revert the SGX changes is that we can split the binding to a separate commit in our main patch set. There is a design choice to be made whether to bound the selftest by recursing from the x86 makefile or alternatively have it added to TARGETS (i.e. TARGET += "x86/sgx"). Thus, the change that implements the binding must a be a separate commit. Signed-off-by: Jarkko Sakkinen --- tools/testing/selftests/x86/Makefile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile index a1831406fd01..fa07d526fe39 100644 --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@ -1,7 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 - -SUBDIRS_64 := sgx - all: include ../lib.mk @@ -71,13 +68,6 @@ all_32: $(BINARIES_32) all_64: $(BINARIES_64) -all_64: $(SUBDIRS_64) - @for DIR in $(SUBDIRS_64); do \ - BUILD_TARGET=$(OUTPUT)/$$DIR; \ - mkdir $$BUILD_TARGET -p; \ - make OUTPUT=$$BUILD_TARGET -C $$DIR $@; \ - done - EXTRA_CLEAN := $(BINARIES_32) $(BINARIES_64) $(BINARIES_32): $(OUTPUT)/%_32: %.c