From patchwork Wed Sep 15 00:13:52 2077 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 743014 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3203DC4167B for ; Wed, 8 Nov 2023 17:40:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231555AbjKHRkJ (ORCPT ); Wed, 8 Nov 2023 12:40:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229974AbjKHRkI (ORCPT ); Wed, 8 Nov 2023 12:40:08 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B50F199; Wed, 8 Nov 2023 09:40:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1699465203; bh=tiJ2JW2vQSAVtrjfe1rVfr6WSRjf+WLHWHD+0FEQ1ao=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=uYdGP+eXcfxfrE2KHIdruvOGEPrt1GzfgH5IpaVk6yTd4v4tdvKQ2ayjtQdrzUd4g g2hmIqhF0HkijSiFZLvOHYcCCRp5dYsVo+AfnmG5xSIwF5C2HhNjLd8lWfj9xlFdOL xllWEA6wgfKn9hH86avlVAvwZ4AQPeyzaEb1FwXI= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Wed, 15 Sep 2077 02:13:52 +0200 Subject: [PATCH 1/2] selftests/nolibc: introduce QEMU_ARCH_USER MIME-Version: 1.0 Message-Id: <20770915-nolibc-run-user-v1-1-3caec61726dc@weissschuh.net> References: <20770915-nolibc-run-user-v1-0-3caec61726dc@weissschuh.net> In-Reply-To: <20770915-nolibc-run-user-v1-0-3caec61726dc@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=3398890432; l=1348; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=tiJ2JW2vQSAVtrjfe1rVfr6WSRjf+WLHWHD+0FEQ1ao=; b=tFbY13AASe4iUbNe8F6FfUWoaOi3NOeLIFYlxn7lHFwI9In7TA6azw6dVXrTT7DhGesHOAOdT 3kSnoLAx+HiA3B+FmiAzOic7aCJnBUWrEh/5muayr0yh7R3OLR9g7VH X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org While ppc64le shares the same executable with regular ppc64 the user variant needs has a dedicated executable. Introduce a new QEMU_ARCH_USER Makefile variable to accommodate that. Fixes: 17362f3d0bd3 ("selftests/nolibc: use qemu-system-ppc64 for ppc64le") Signed-off-by: Thomas Weißschuh --- tools/testing/selftests/nolibc/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index 508435b8ac2a..501bd41e0830 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -106,6 +106,9 @@ QEMU_ARCH_s390 = s390x QEMU_ARCH_loongarch = loongarch64 QEMU_ARCH = $(QEMU_ARCH_$(XARCH)) +QEMU_ARCH_USER_ppc64le = ppc64le +QEMU_ARCH_USER = $(or $(QEMU_ARCH_USER_$(XARCH)),$(QEMU_ARCH_$(XARCH))) + QEMU_BIOS_DIR = /usr/share/edk2/ QEMU_BIOS_loongarch = $(QEMU_BIOS_DIR)/loongarch64/OVMF_CODE.fd @@ -223,7 +226,7 @@ run-nolibc-test: nolibc-test # qemu user-land test run-user: nolibc-test - $(Q)qemu-$(QEMU_ARCH) ./nolibc-test > "$(CURDIR)/run.out" || : + $(Q)qemu-$(QEMU_ARCH_USER) ./nolibc-test > "$(CURDIR)/run.out" || : $(Q)$(REPORT) $(CURDIR)/run.out initramfs.cpio: kernel nolibc-test From patchwork Wed Sep 15 00:13:53 2077 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 742463 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD7F9C4332F for ; Wed, 8 Nov 2023 17:40:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229554AbjKHRkJ (ORCPT ); Wed, 8 Nov 2023 12:40:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229989AbjKHRkI (ORCPT ); Wed, 8 Nov 2023 12:40:08 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B5871FF9; Wed, 8 Nov 2023 09:40:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1699465203; bh=hrSs+ELRz/jSt3WaBZG039mXUiADzaDK3quVSJkBbbQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cY2V3bWdliYdj4isK0+f2qLz2sskHnNXV6oW+rJo/j7Wrc0p93pKpIHDXn2mmE+1D NxnMJQqW/NvwHFdTekZyT/hGHS/6xJM69cwWEpyWgF5zd1a58slpb2oYqtza74dJXj mrChZM83iEsNaj+Lfopv0zipPnhrxZdw2MLJZDo8= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Wed, 15 Sep 2077 02:13:53 +0200 Subject: [PATCH 2/2] selftests/nolibc: run-tests.sh: enable testing via qemu-user MIME-Version: 1.0 Message-Id: <20770915-nolibc-run-user-v1-2-3caec61726dc@weissschuh.net> References: <20770915-nolibc-run-user-v1-0-3caec61726dc@weissschuh.net> In-Reply-To: <20770915-nolibc-run-user-v1-0-3caec61726dc@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=3398890432; l=2167; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=hrSs+ELRz/jSt3WaBZG039mXUiADzaDK3quVSJkBbbQ=; b=BtJDyH6ArfAWz9IHWMmkI/ILA4rmjwjryl0P79bAlWzKH/YtjZgsGJSBKU6d39kfuyMw8e8pp 2KR+T4WN9x2DgIimnUn2yaePUh8kQ+xPYtAAvt6CcBKV5pkgYJPjTbv X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org qemu-user is faster than a full system test. Signed-off-by: Thomas Weißschuh --- tools/testing/selftests/nolibc/run-tests.sh | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/nolibc/run-tests.sh b/tools/testing/selftests/nolibc/run-tests.sh index 3a1eaccfbd8d..c0a5a7cea9fa 100755 --- a/tools/testing/selftests/nolibc/run-tests.sh +++ b/tools/testing/selftests/nolibc/run-tests.sh @@ -14,9 +14,10 @@ cache_dir="${XDG_CACHE_HOME:-"$HOME"/.cache}" download_location="${cache_dir}/crosstools/" build_location="$(realpath "${cache_dir}"/nolibc-tests/)" perform_download=0 +test_mode=system archs="i386 x86_64 arm64 arm mips32le mips32be ppc ppc64 ppc64le riscv s390 loongarch" -TEMP=$(getopt -o 'j:d:c:b:a:ph' -n "$0" -- "$@") +TEMP=$(getopt -o 'j:d:c:b:a:m:ph' -n "$0" -- "$@") eval set -- "$TEMP" unset TEMP @@ -38,6 +39,7 @@ Options: -c [VERSION] Version of toolchains to use (default: ${crosstool_version}) -a [ARCH] Host architecture of toolchains to use (default: ${hostarch}) -b [DIR] Build location (default: ${build_location}) + -m [MODE] Test mode user/system (default: ${test_mode}) EOF } @@ -61,6 +63,9 @@ while true; do '-b') build_location="$(realpath "$2")" shift 2; continue ;; + '-m') + test_mode="$2" + shift 2; continue ;; '-h') print_usage exit 0 @@ -133,11 +138,22 @@ test_arch() { MAKE=(make -j"${nproc}" XARCH="${arch}" CROSS_COMPILE="${cross_compile}" O="${build_dir}") mkdir -p "$build_dir" - if [ ! -f "${build_dir}/.config" ]; then + if [ "$test_mode" = "system" ] && [ ! -f "${build_dir}/.config" ]; then swallow_output "${MAKE[@]}" defconfig fi + case "$test_mode" in + 'system') + test_target=run + ;; + 'user') + test_target=run-user + ;; + *) + echo "Unknown mode $test_mode" + exit 1 + esac printf '%-15s' "$arch:" - swallow_output "${MAKE[@]}" run V=1 + swallow_output "${MAKE[@]}" "$test_target" V=1 cp run.out run.out."${arch}" "${MAKE[@]}" report | grep passed }