From patchwork Mon Aug 3 14:41:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 503204 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 7EA31140E6C for ; Tue, 4 Aug 2015 00:41:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754008AbbHCOlp (ORCPT ); Mon, 3 Aug 2015 10:41:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51028 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753492AbbHCOlo (ORCPT ); Mon, 3 Aug 2015 10:41:44 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id A2D6B78; Mon, 3 Aug 2015 14:41:44 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-112.brq.redhat.com [10.34.1.112]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t73EfYNk006138; Mon, 3 Aug 2015 10:41:42 -0400 From: Andrew Jones To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com Subject: [kvm-unit-tests PATCH 03/14] config: no need to mix arch makefiles Date: Mon, 3 Aug 2015 16:41:20 +0200 Message-Id: <1438612891-3718-4-git-send-email-drjones@redhat.com> In-Reply-To: <1438612891-3718-1-git-send-email-drjones@redhat.com> References: <1438612891-3718-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 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 --- 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 (92%) diff --git a/Makefile b/Makefile index 0d5933474cd8c..2dcc323592299 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,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 0884aafa21d18..4cb30892699f4 100644 --- a/README +++ b/README @@ -28,8 +28,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 4cff846930796..f50d9f9d4e0f6 100644 --- a/config/config-arm-common.mak +++ b/arm/Makefile.common @@ -30,7 +30,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 691381ca69c85..ec189ce735bad 100644 --- a/config/config-i386.mak +++ b/x86/Makefile.i386 @@ -6,7 +6,7 @@ CFLAGS += -I $(KERNELDIR)/include 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 92% rename from config/config-x86_64.mak rename to x86/Makefile.x86_64 index 7d4eb3494647e..e7799fe62b032 100644 --- a/config/config-x86_64.mak +++ b/x86/Makefile.x86_64 @@ -12,4 +12,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