From: Nicholas Piggin <npiggin@gmail.com> To: Thomas Huth <thuth@redhat.com> Cc: "Nicholas Piggin" <npiggin@gmail.com>, "Laurent Vivier" <lvivier@redhat.com>, "Andrew Jones" <andrew.jones@linux.dev>, "Paolo Bonzini" <pbonzini@redhat.com>, linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, "Alexandru Elisei" <alexandru.elisei@arm.com>, "Claudio Imbrenda" <imbrenda@linux.ibm.com>, "David Hildenbrand" <david@redhat.com>, "Eric Auger" <eric.auger@redhat.com>, "Janosch Frank" <frankja@linux.ibm.com>, "Nico Böhr" <nrb@linux.ibm.com>, linux-s390@vger.kernel.org, kvmarm@lists.linux.dev, kvm-riscv@lists.infradead.org Subject: [kvm-unit-tests PATCH v7 33/35] configure: Make arch_libdir a first-class entity Date: Tue, 19 Mar 2024 17:59:24 +1000 [thread overview] Message-ID: <20240319075926.2422707-34-npiggin@gmail.com> (raw) In-Reply-To: <20240319075926.2422707-1-npiggin@gmail.com> arch_libdir was brought in to improve the heuristic determination of the lib/ directory based on arch and testdir names, but it did not entirely clean that mess up. Remove the arch_libdir->arch->testdir heuristic and just require everybody sets arch_libdir correctly. Fail if the lib/arch or lib/arch/asm directories can not be found. Cc: Alexandru Elisei <alexandru.elisei@arm.com> Cc: Claudio Imbrenda <imbrenda@linux.ibm.com> Cc: David Hildenbrand <david@redhat.com> Cc: Eric Auger <eric.auger@redhat.com> Cc: Janosch Frank <frankja@linux.ibm.com> Cc: Laurent Vivier <lvivier@redhat.com> Cc: Nico Böhr <nrb@linux.ibm.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Thomas Huth <thuth@redhat.com> Cc: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org Cc: kvmarm@lists.linux.dev Cc: kvm-riscv@lists.infradead.org Cc: linuxppc-dev@lists.ozlabs.org Reviewed-by: Andrew Jones <andrew.jones@linux.dev> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- Makefile | 2 +- configure | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4f35fffc6..4e0f54543 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ include config.mak VPATH = $(SRCDIR) libdirs-get = $(shell [ -d "lib/$(1)" ] && echo "lib/$(1) lib/$(1)/asm") -ARCH_LIBDIRS := $(call libdirs-get,$(ARCH_LIBDIR)) $(call libdirs-get,$(TEST_DIR)) +ARCH_LIBDIRS := $(call libdirs-get,$(ARCH_LIBDIR)) OBJDIRS := $(ARCH_LIBDIRS) DESTDIR := $(PREFIX)/share/kvm-unit-tests/ diff --git a/configure b/configure index e19ba6f0c..a1308db8e 100755 --- a/configure +++ b/configure @@ -216,7 +216,6 @@ fi arch_name=$arch [ "$arch" = "aarch64" ] && arch="arm64" [ "$arch_name" = "arm64" ] && arch_name="aarch64" -arch_libdir=$arch if [ "$arch" = "riscv" ]; then echo "riscv32 or riscv64 must be specified" @@ -286,8 +285,10 @@ fi if [ "$arch" = "i386" ] || [ "$arch" = "x86_64" ]; then testdir=x86 + arch_libdir=x86 elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then testdir=arm + arch_libdir=$arch if [ "$target" = "qemu" ]; then arm_uart_early_addr=0x09000000 elif [ "$target" = "kvmtool" ]; then @@ -336,6 +337,7 @@ elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then fi elif [ "$arch" = "ppc64" ]; then testdir=powerpc + arch_libdir=ppc64 firmware="$testdir/boot_rom.bin" if [ "$endian" != "little" ] && [ "$endian" != "big" ]; then echo "You must provide endianness (big or little)!" @@ -346,6 +348,7 @@ elif [ "$arch" = "riscv32" ] || [ "$arch" = "riscv64" ]; then arch_libdir=riscv elif [ "$arch" = "s390x" ]; then testdir=s390x + arch_libdir=s390x else echo "arch $arch is not supported!" arch= @@ -355,6 +358,10 @@ if [ ! -d "$srcdir/$testdir" ]; then echo "$srcdir/$testdir does not exist!" exit 1 fi +if [ ! -d "$srcdir/lib/$arch_libdir" ]; then + echo "$srcdir/lib/$arch_libdir does not exist!" + exit 1 +fi if [ "$efi" = "y" ] && [ -f "$srcdir/$testdir/efi/run" ]; then ln -fs "$srcdir/$testdir/efi/run" $testdir-run @@ -417,10 +424,11 @@ fi # link lib/asm for the architecture rm -f lib/asm asm="asm-generic" -if [ -d "$srcdir/lib/$arch/asm" ]; then - asm="$srcdir/lib/$arch/asm" -elif [ -d "$srcdir/lib/$testdir/asm" ]; then - asm="$srcdir/lib/$testdir/asm" +if [ -d "$srcdir/lib/$arch_libdir/asm" ]; then + asm="$srcdir/lib/$arch_libdir/asm" +else + echo "$srcdir/lib/$arch_libdir/asm does not exist" + exit 1 fi mkdir -p lib ln -sf "$asm" lib/asm -- 2.42.0
WARNING: multiple messages have this Message-ID (diff)
From: Nicholas Piggin <npiggin@gmail.com> To: Thomas Huth <thuth@redhat.com> Cc: "Laurent Vivier" <lvivier@redhat.com>, linux-s390@vger.kernel.org, "Nico Böhr" <nrb@linux.ibm.com>, "Janosch Frank" <frankja@linux.ibm.com>, kvm@vger.kernel.org, "David Hildenbrand" <david@redhat.com>, "Alexandru Elisei" <alexandru.elisei@arm.com>, "Nicholas Piggin" <npiggin@gmail.com>, "Andrew Jones" <andrew.jones@linux.dev>, "Eric Auger" <eric.auger@redhat.com>, kvm-riscv@lists.infradead.org, kvmarm@lists.linux.dev, "Paolo Bonzini" <pbonzini@redhat.com>, "Claudio Imbrenda" <imbrenda@linux.ibm.com>, linuxppc-dev@lists.ozlabs.org Subject: [kvm-unit-tests PATCH v7 33/35] configure: Make arch_libdir a first-class entity Date: Tue, 19 Mar 2024 17:59:24 +1000 [thread overview] Message-ID: <20240319075926.2422707-34-npiggin@gmail.com> (raw) In-Reply-To: <20240319075926.2422707-1-npiggin@gmail.com> arch_libdir was brought in to improve the heuristic determination of the lib/ directory based on arch and testdir names, but it did not entirely clean that mess up. Remove the arch_libdir->arch->testdir heuristic and just require everybody sets arch_libdir correctly. Fail if the lib/arch or lib/arch/asm directories can not be found. Cc: Alexandru Elisei <alexandru.elisei@arm.com> Cc: Claudio Imbrenda <imbrenda@linux.ibm.com> Cc: David Hildenbrand <david@redhat.com> Cc: Eric Auger <eric.auger@redhat.com> Cc: Janosch Frank <frankja@linux.ibm.com> Cc: Laurent Vivier <lvivier@redhat.com> Cc: Nico Böhr <nrb@linux.ibm.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Thomas Huth <thuth@redhat.com> Cc: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org Cc: kvmarm@lists.linux.dev Cc: kvm-riscv@lists.infradead.org Cc: linuxppc-dev@lists.ozlabs.org Reviewed-by: Andrew Jones <andrew.jones@linux.dev> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- Makefile | 2 +- configure | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4f35fffc6..4e0f54543 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ include config.mak VPATH = $(SRCDIR) libdirs-get = $(shell [ -d "lib/$(1)" ] && echo "lib/$(1) lib/$(1)/asm") -ARCH_LIBDIRS := $(call libdirs-get,$(ARCH_LIBDIR)) $(call libdirs-get,$(TEST_DIR)) +ARCH_LIBDIRS := $(call libdirs-get,$(ARCH_LIBDIR)) OBJDIRS := $(ARCH_LIBDIRS) DESTDIR := $(PREFIX)/share/kvm-unit-tests/ diff --git a/configure b/configure index e19ba6f0c..a1308db8e 100755 --- a/configure +++ b/configure @@ -216,7 +216,6 @@ fi arch_name=$arch [ "$arch" = "aarch64" ] && arch="arm64" [ "$arch_name" = "arm64" ] && arch_name="aarch64" -arch_libdir=$arch if [ "$arch" = "riscv" ]; then echo "riscv32 or riscv64 must be specified" @@ -286,8 +285,10 @@ fi if [ "$arch" = "i386" ] || [ "$arch" = "x86_64" ]; then testdir=x86 + arch_libdir=x86 elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then testdir=arm + arch_libdir=$arch if [ "$target" = "qemu" ]; then arm_uart_early_addr=0x09000000 elif [ "$target" = "kvmtool" ]; then @@ -336,6 +337,7 @@ elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then fi elif [ "$arch" = "ppc64" ]; then testdir=powerpc + arch_libdir=ppc64 firmware="$testdir/boot_rom.bin" if [ "$endian" != "little" ] && [ "$endian" != "big" ]; then echo "You must provide endianness (big or little)!" @@ -346,6 +348,7 @@ elif [ "$arch" = "riscv32" ] || [ "$arch" = "riscv64" ]; then arch_libdir=riscv elif [ "$arch" = "s390x" ]; then testdir=s390x + arch_libdir=s390x else echo "arch $arch is not supported!" arch= @@ -355,6 +358,10 @@ if [ ! -d "$srcdir/$testdir" ]; then echo "$srcdir/$testdir does not exist!" exit 1 fi +if [ ! -d "$srcdir/lib/$arch_libdir" ]; then + echo "$srcdir/lib/$arch_libdir does not exist!" + exit 1 +fi if [ "$efi" = "y" ] && [ -f "$srcdir/$testdir/efi/run" ]; then ln -fs "$srcdir/$testdir/efi/run" $testdir-run @@ -417,10 +424,11 @@ fi # link lib/asm for the architecture rm -f lib/asm asm="asm-generic" -if [ -d "$srcdir/lib/$arch/asm" ]; then - asm="$srcdir/lib/$arch/asm" -elif [ -d "$srcdir/lib/$testdir/asm" ]; then - asm="$srcdir/lib/$testdir/asm" +if [ -d "$srcdir/lib/$arch_libdir/asm" ]; then + asm="$srcdir/lib/$arch_libdir/asm" +else + echo "$srcdir/lib/$arch_libdir/asm does not exist" + exit 1 fi mkdir -p lib ln -sf "$asm" lib/asm -- 2.42.0
next prev parent reply other threads:[~2024-03-19 8:01 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-19 7:58 [kvm-unit-tests PATCH v7 00/35] migration, powerpc improvements Nicholas Piggin 2024-03-19 7:58 ` Nicholas Piggin 2024-03-19 7:58 ` [kvm-unit-tests PATCH v7 01/35] arch-run: Add functions to help handle migration directives from test Nicholas Piggin 2024-03-19 7:58 ` Nicholas Piggin 2024-03-25 15:54 ` Thomas Huth 2024-03-25 15:54 ` Thomas Huth 2024-03-19 7:58 ` [kvm-unit-tests PATCH v7 02/35] arch-run: Keep infifo open Nicholas Piggin 2024-03-19 7:58 ` Nicholas Piggin 2024-03-19 7:58 ` [kvm-unit-tests PATCH v7 03/35] migration: Add a migrate_skip command Nicholas Piggin 2024-03-19 7:58 ` Nicholas Piggin 2024-03-19 7:58 ` [kvm-unit-tests PATCH v7 04/35] (arm|s390): Use migrate_skip in test cases Nicholas Piggin 2024-03-19 7:58 ` Nicholas Piggin 2024-03-19 7:58 ` [kvm-unit-tests PATCH v7 05/35] arch-run: Add a "continuous" migration option for tests Nicholas Piggin 2024-03-19 7:58 ` Nicholas Piggin 2024-03-19 7:58 ` [kvm-unit-tests PATCH v7 06/35] gitlab-ci: Run migration selftest on s390x and powerpc Nicholas Piggin 2024-03-19 7:58 ` Nicholas Piggin 2024-03-25 16:08 ` Thomas Huth 2024-03-25 16:08 ` Thomas Huth 2024-03-28 8:16 ` Nicholas Piggin 2024-03-28 8:16 ` Nicholas Piggin 2024-03-19 7:58 ` [kvm-unit-tests PATCH v7 07/35] common: add memory dirtying vs migration test Nicholas Piggin 2024-03-19 7:58 ` Nicholas Piggin 2024-03-28 17:37 ` Thomas Huth 2024-03-28 17:37 ` Thomas Huth 2024-04-05 4:54 ` Nicholas Piggin 2024-04-05 4:54 ` Nicholas Piggin 2024-03-19 7:58 ` [kvm-unit-tests PATCH v7 08/35] powerpc: Fix KVM caps on POWER9 hosts Nicholas Piggin 2024-03-19 7:58 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 09/35] powerpc: Fix stack backtrace termination Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 10/35] powerpc: interrupt stack backtracing Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 11/35] powerpc/sprs: Specify SPRs with data rather than code Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 12/35] powerpc/sprs: Avoid taking PMU interrupts caused by register fuzzing Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 13/35] doc: start documentation directory with unittests.cfg doc Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 14/35] scripts: allow machine option to be specified in unittests.cfg Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 15/35] scripts: Accommodate powerpc powernv machine differences Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 16/35] powerpc: Support powernv machine with QEMU TCG Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 17/35] powerpc: Fix emulator illegal instruction test for powernv Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 18/35] powerpc/sprs: Test hypervisor registers on powernv machine Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 19/35] powerpc: general interrupt tests Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 20/35] powerpc: Add rtas stop-self support Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 21/35] powerpc: Remove broken SMP exception stack setup Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 22/35] powerpc: add SMP and IPI support Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 23/35] powerpc: Permit ACCEL=tcg,thread=single Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 24/35] powerpc: Avoid using larx/stcx. in spinlocks when only one CPU is running Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 25/35] powerpc: Add atomics tests Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 26/35] powerpc: Add timebase tests Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 27/35] powerpc: Add MMU support Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 28/35] common/sieve: Use vmalloc.h for setup_mmu definition Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 29/35] common/sieve: Support machines without MMU Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 30/35] powerpc: Add sieve.c common test Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 31/35] powerpc: add usermode support Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 32/35] powerpc: add pmu tests Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin [this message] 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 33/35] configure: Make arch_libdir a first-class entity Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 34/35] powerpc: Remove remnants of ppc64 directory and build structure Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin 2024-03-19 7:59 ` [kvm-unit-tests PATCH v7 35/35] powerpc: gitlab CI update Nicholas Piggin 2024-03-19 7:59 ` Nicholas Piggin
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=20240319075926.2422707-34-npiggin@gmail.com \ --to=npiggin@gmail.com \ --cc=alexandru.elisei@arm.com \ --cc=andrew.jones@linux.dev \ --cc=david@redhat.com \ --cc=eric.auger@redhat.com \ --cc=frankja@linux.ibm.com \ --cc=imbrenda@linux.ibm.com \ --cc=kvm-riscv@lists.infradead.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.linux.dev \ --cc=linux-s390@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=lvivier@redhat.com \ --cc=nrb@linux.ibm.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.