From: Andrew Jones <drjones@redhat.com> 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 Subject: [kvm-unit-tests PATCH v4 07/17] config: no need to mix arch makefiles Date: Mon, 15 Feb 2016 14:49:16 +0100 [thread overview] Message-ID: <1455544166-19766-8-git-send-email-drjones@redhat.com> (raw) In-Reply-To: <1455544166-19766-1-git-send-email-drjones@redhat.com> 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 <drjones@redhat.com> --- 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/<ARCH>: architecture dependent services for the tests ./<ARCH>: 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 -- 2.4.3
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <drjones@redhat.com> 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 Subject: [kvm-unit-tests PATCH v4 07/17] config: no need to mix arch makefiles Date: Mon, 15 Feb 2016 13:49:16 +0000 [thread overview] Message-ID: <1455544166-19766-8-git-send-email-drjones@redhat.com> (raw) In-Reply-To: <1455544166-19766-1-git-send-email-drjones@redhat.com> 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 <drjones@redhat.com> --- 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/<ARCH>: architecture dependent services for the tests ./<ARCH>: 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 -- 2.4.3
next prev parent reply other threads:[~2016-02-15 13:50 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-15 13:49 [kvm-unit-tests PATCH v4 00/17] ppc64: initial drop Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 01/17] arm/arm64: trivial: another assert fix Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 02/17] Makefile: cscope: also look in arch shared asm Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 03/17] lib: asm-generic: add missing casts Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 04/17] devicetree: fix dt_get_memory_params Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-16 6:11 ` David Gibson 2016-02-16 6:11 ` David Gibson 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 05/17] arm/arm64: setup improvements Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-16 6:15 ` David Gibson 2016-02-16 6:15 ` David Gibson 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 06/17] lib: share arm-selftest utility functions Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-17 0:14 ` David Gibson 2016-02-17 0:14 ` David Gibson 2016-02-17 12:17 ` Andrew Jones 2016-02-17 12:17 ` Andrew Jones 2016-02-15 13:49 ` Andrew Jones [this message] 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 07/17] config: no need to mix arch makefiles Andrew Jones 2016-02-17 1:18 ` David Gibson 2016-02-17 1:18 ` David Gibson 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 08/17] powerpc/ppc64: start skeleton framework Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 09/17] powerpc/ppc64: ppc-ify makefiles and linker script Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-17 1:45 ` David Gibson 2016-02-17 1:45 ` David Gibson 2016-02-17 12:21 ` Andrew Jones 2016-02-17 12:21 ` Andrew Jones 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 10/17] powerpc/ppc64: add a boot rom Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-17 1:50 ` David Gibson 2016-02-17 1:50 ` David Gibson 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 11/17] powerpc/ppc64: add hcall support and putchar Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-17 2:04 ` David Gibson 2016-02-17 2:04 ` David Gibson 2016-02-17 12:34 ` Andrew Jones 2016-02-17 12:34 ` Andrew Jones 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 12/17] powerpc/ppc64: adapt arm's setup Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-17 2:11 ` David Gibson 2016-02-17 2:11 ` David Gibson 2016-02-17 12:45 ` Andrew Jones 2016-02-17 12:45 ` Andrew Jones 2016-02-17 17:34 ` Andrew Jones 2016-02-17 17:34 ` Andrew Jones 2016-02-18 0:05 ` David Gibson 2016-02-18 0:05 ` David Gibson 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 13/17] powerpc/ppc64: relocate linker VMAs Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-17 2:14 ` David Gibson 2016-02-17 2:14 ` David Gibson 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 14/17] powerpc/ppc64: add run script and unittests.cfg Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 15/17] mkstandalone: add support for powerpc Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-17 12:51 ` Andrew Jones 2016-02-17 12:51 ` Andrew Jones 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 16/17] powerpc/ppc64: add RTAS support Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-15 13:49 ` [kvm-unit-tests PATCH v4 17/17] powerpc/ppc64: make a fake debug-exit Andrew Jones 2016-02-15 13:49 ` Andrew Jones 2016-02-16 17:32 ` [kvm-unit-tests PATCH v4 00/17] ppc64: initial drop Paolo Bonzini 2016-02-16 17:32 ` Paolo Bonzini 2016-02-16 17:44 ` Andrew Jones 2016-02-16 17:44 ` Andrew Jones
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1455544166-19766-8-git-send-email-drjones@redhat.com \ --to=drjones@redhat.com \ --cc=agraf@suse.de \ --cc=david@gibson.dropbear.id.au \ --cc=dgibson@redhat.com \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ --cc=lvivier@redhat.com \ --cc=pbonzini@redhat.com \ --cc=thuth@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.