From patchwork Wed Feb 17 18:40:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 584290 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BA4DC140327 for ; Thu, 18 Feb 2016 05:41:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423039AbcBQSl2 (ORCPT ); Wed, 17 Feb 2016 13:41:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46319 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423004AbcBQSlZ (ORCPT ); Wed, 17 Feb 2016 13:41:25 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 82F424C65E; Wed, 17 Feb 2016 18:41:25 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-251.brq.redhat.com [10.34.1.251]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1HIf34M030058; Wed, 17 Feb 2016 13:41:23 -0500 From: Andrew Jones To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com, rkrcmar@redhat.com Subject: [kvm-unit-tests PATCH v5 08/18] config: no need to mix arch makefiles Date: Wed, 17 Feb 2016 19:40:49 +0100 Message-Id: <1455734459-31902-9-git-send-email-drjones@redhat.com> In-Reply-To: <1455734459-31902-1-git-send-email-drjones@redhat.com> References: <1455734459-31902-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Move the config/config-*.mak files to their own directories and rename to Makefile.* README is also updated to reflect the change, as well as to remove an optimistic reference to a non-existent docs directory. Signed-off-by: Andrew Jones Reviewed-by: David Gibson --- Makefile | 2 +- README | 3 +-- arm/Makefile | 1 + config/config-arm.mak => arm/Makefile.arm | 2 +- config/config-arm64.mak => arm/Makefile.arm64 | 2 +- config/config-arm-common.mak => arm/Makefile.common | 2 +- {config => scripts}/asm-offsets.mak | 0 x86/Makefile | 1 + config/config-x86-common.mak => x86/Makefile.common | 0 config/config-i386.mak => x86/Makefile.i386 | 2 +- config/config-x86_64.mak => x86/Makefile.x86_64 | 2 +- 11 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 arm/Makefile rename config/config-arm.mak => arm/Makefile.arm (90%) rename config/config-arm64.mak => arm/Makefile.arm64 (89%) rename config/config-arm-common.mak => arm/Makefile.common (98%) rename {config => scripts}/asm-offsets.mak (100%) create mode 100644 x86/Makefile rename config/config-x86-common.mak => x86/Makefile.common (100%) rename config/config-i386.mak => x86/Makefile.i386 (91%) rename config/config-x86_64.mak => x86/Makefile.x86_64 (93%) diff --git a/Makefile b/Makefile index fe5cc620d473b..ddba941858596 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES)) LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION)) #include architecure specific make rules -include config/config-$(ARCH).mak +include $(TEST_DIR)/Makefile # cc-option # Usage: OP_CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0) diff --git a/README b/README index 457bd797362cf..f8f196d90bf10 100644 --- a/README +++ b/README @@ -34,8 +34,7 @@ each as a standalone test. Directory structure: .: configure script, top-level Makefile, and run_tests.sh -./config: collection of architecture dependent makefiles -./docs: documentation files +./scripts: helper scripts for building and running tests ./lib: general architecture neutral services for the tests ./lib/: architecture dependent services for the tests ./: the sources of the tests and the created objects/images diff --git a/arm/Makefile b/arm/Makefile new file mode 100644 index 0000000000000..369a38b2d1703 --- /dev/null +++ b/arm/Makefile @@ -0,0 +1 @@ +include $(TEST_DIR)/Makefile.$(ARCH) diff --git a/config/config-arm.mak b/arm/Makefile.arm similarity index 90% rename from config/config-arm.mak rename to arm/Makefile.arm index ae6c2e7134883..946422872532d 100644 --- a/config/config-arm.mak +++ b/arm/Makefile.arm @@ -18,6 +18,6 @@ cflatobjs += lib/arm/processor.o # arm specific tests tests = -include config/config-arm-common.mak +include $(TEST_DIR)/Makefile.common arch_clean: arm_clean diff --git a/config/config-arm64.mak b/arm/Makefile.arm64 similarity index 89% rename from config/config-arm64.mak rename to arm/Makefile.arm64 index d61b703c8140e..0b0761c729c7c 100644 --- a/config/config-arm64.mak +++ b/arm/Makefile.arm64 @@ -14,7 +14,7 @@ cflatobjs += lib/arm64/spinlock.o # arm64 specific tests tests = -include config/config-arm-common.mak +include $(TEST_DIR)/Makefile.common arch_clean: arm_clean $(RM) lib/arm64/.*.d diff --git a/config/config-arm-common.mak b/arm/Makefile.common similarity index 98% rename from config/config-arm-common.mak rename to arm/Makefile.common index bd153cf6ea5ba..dd3a0ca327d06 100644 --- a/config/config-arm-common.mak +++ b/arm/Makefile.common @@ -25,7 +25,7 @@ CFLAGS += -O2 CFLAGS += -I lib -I lib/libfdt asm-offsets = lib/$(ARCH)/asm-offsets.h -include config/asm-offsets.mak +include scripts/asm-offsets.mak cflatobjs += lib/util.o cflatobjs += lib/alloc.o diff --git a/config/asm-offsets.mak b/scripts/asm-offsets.mak similarity index 100% rename from config/asm-offsets.mak rename to scripts/asm-offsets.mak diff --git a/x86/Makefile b/x86/Makefile new file mode 100644 index 0000000000000..369a38b2d1703 --- /dev/null +++ b/x86/Makefile @@ -0,0 +1 @@ +include $(TEST_DIR)/Makefile.$(ARCH) diff --git a/config/config-x86-common.mak b/x86/Makefile.common similarity index 100% rename from config/config-x86-common.mak rename to x86/Makefile.common diff --git a/config/config-i386.mak b/x86/Makefile.i386 similarity index 91% rename from config/config-i386.mak rename to x86/Makefile.i386 index e353387551585..8a4c45c457476 100644 --- a/config/config-i386.mak +++ b/x86/Makefile.i386 @@ -8,7 +8,7 @@ cflatobjs += lib/x86/setjmp32.o tests = $(TEST_DIR)/taskswitch.flat $(TEST_DIR)/taskswitch2.flat \ $(TEST_DIR)/cmpxchg8b.flat -include config/config-x86-common.mak +include $(TEST_DIR)/Makefile.common $(TEST_DIR)/cmpxchg8b.elf: $(cstart.o) $(TEST_DIR)/cmpxchg8b.o $(TEST_DIR)/taskswitch.elf: $(cstart.o) $(TEST_DIR)/taskswitch.o diff --git a/config/config-x86_64.mak b/x86/Makefile.x86_64 similarity index 93% rename from config/config-x86_64.mak rename to x86/Makefile.x86_64 index d190be82e0cf2..6b7ccfba550b6 100644 --- a/config/config-x86_64.mak +++ b/x86/Makefile.x86_64 @@ -15,4 +15,4 @@ tests += $(TEST_DIR)/svm.flat tests += $(TEST_DIR)/vmx.flat tests += $(TEST_DIR)/tscdeadline_latency.flat -include config/config-x86-common.mak +include $(TEST_DIR)/Makefile.common