From patchwork Wed Jan 22 18:41:44 2025 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: 13947640 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE0892153FF; Wed, 22 Jan 2025 18:42:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737571325; cv=none; b=bGWcg6SzvsPsf+gb98eae+kWimq8RxgyOZ/vf/RHzAcL7PZbkMHWjysKaazhipH8OSNm3ypronBZ8qjd/uD0w7ujmHCVWsLArjZsJUpdF6rUhmPu9q4pa5QrykLwo4iN4OtvRa4K3swYxORkm8hIrJEL/0mtujICLrD1vjqP/J0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737571325; c=relaxed/simple; bh=+CRDay+53YjmjDUoZr23NQjukGzwcpQV4L/S0QarAVc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R3B+z3Neig74FkFYUlK9dKxDhHpNswXvg9mIxMvvtt1ETLU31nBqrg/RQ1/earsY/spg/px4oUgV7gT1bE5rs+h1qOUDLmOnQ6S5oF3tShMjpOij7oqaw7ZSWB/mntBBVrfjXLPJ8eogOg901wz+fQbhk0wIbl4c7L3iNxralHQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=pn2QIjNj; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="pn2QIjNj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1737571320; bh=+CRDay+53YjmjDUoZr23NQjukGzwcpQV4L/S0QarAVc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pn2QIjNjl6xeKLGnRDI6EnYvwTtfXADvjaZn6+38bPDY+P+sJ0bso/bMfij7p7dMY OXy8vZROLYcJJOVWYt0a4nHwECcQgdhjyJxU0+Zl3iIhs3IN2fNUPpjwxtvU4l80xo YwYOz/hOYAZvlqRwIwveo0NavGAG7vMVKCJlrmgU= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Wed, 22 Jan 2025 19:41:44 +0100 Subject: [PATCH 1/5] selftests/nolibc: drop custom EXTRACONFIG functionality Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250122-nolibc-config-v1-1-a697db968b49@weissschuh.net> References: <20250122-nolibc-config-v1-0-a697db968b49@weissschuh.net> In-Reply-To: <20250122-nolibc-config-v1-0-a697db968b49@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.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737571320; l=1920; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=+CRDay+53YjmjDUoZr23NQjukGzwcpQV4L/S0QarAVc=; b=1eVGiGV42afDCRd8dXJo98zrSgUFZmQEeaDIYF+vS5HhmJZN620aIe5hWr8G6F/DM6QV1RCJE nEbiZRnlwh8DbyLSF/RoH0YrzIyBGyL8RdUvgYj+E7YKR8N2zGv32RQ X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= kbuild already contains logic to merge predefines snippets into a defconfig file. This already works nicely with the current "defconfig" target. Make use of the snippet and drop the custom logic. Signed-off-by: Thomas Weißschuh --- tools/testing/selftests/nolibc/Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index 7d14a7c0cb62608f328b251495264517d333db2e..ba044c8a042ce345ff90bdd35569de4b5acd117d 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -82,7 +82,7 @@ DEFCONFIG_x86 = defconfig DEFCONFIG_arm64 = defconfig DEFCONFIG_arm = multi_v7_defconfig DEFCONFIG_mips32le = malta_defconfig -DEFCONFIG_mips32be = malta_defconfig +DEFCONFIG_mips32be = malta_defconfig generic/eb.config DEFCONFIG_ppc = pmac32_defconfig DEFCONFIG_ppc64 = powernv_be_defconfig DEFCONFIG_ppc64le = powernv_defconfig @@ -93,9 +93,6 @@ DEFCONFIG_s390 = defconfig DEFCONFIG_loongarch = defconfig DEFCONFIG = $(DEFCONFIG_$(XARCH)) -EXTRACONFIG_mips32be = -d CONFIG_CPU_LITTLE_ENDIAN -e CONFIG_CPU_BIG_ENDIAN -EXTRACONFIG = $(EXTRACONFIG_$(XARCH)) - # optional tests to run (default = all) TEST = @@ -265,10 +262,6 @@ initramfs: nolibc-test defconfig: $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) mrproper $(DEFCONFIG) prepare - $(Q)if [ -n "$(EXTRACONFIG)" ]; then \ - $(srctree)/scripts/config --file $(objtree)/.config $(EXTRACONFIG); \ - $(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) olddefconfig < /dev/null; \ - fi kernel: $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) < /dev/null From patchwork Wed Jan 22 18:41:45 2025 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: 13947639 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60B20215772; Wed, 22 Jan 2025 18:42:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737571325; cv=none; b=I2rQzqW5MlvMMCc+ymm7IIpnYezXFeTfognkpYCgOJIXGgbJKkyTP9Q3S7ATwGqmF3WWU8cjOT6qewhbAVFwLW+zD21nyvgJn9C5zi18sdnt4W6D7/e3FPyUZ9lzZI0Tm4II0DSkPPcGJQPB/x07RBOkmMU6YaRBv73YYW4/d5Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737571325; c=relaxed/simple; bh=yOnX0FgFgCBauRdniu/luUgUK6bKzG+/jixgAfNPI50=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YKtrQeOzAIKPMrE5ZHbVh/jEbaJYiTPMVL4dsRE/eNN0On7w40Cbe390EyJQu7rrLkQKCFIguvWoVKIRNTVNNnFkCZb0wJrvRZovXx54zCznqxy6IteuqNEqhndS/BpBco3ZjNkWY+T9qfKPxzbGe4ICSbujeGorSQT7kJj9VWg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=Yhw4X1lQ; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="Yhw4X1lQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1737571320; bh=yOnX0FgFgCBauRdniu/luUgUK6bKzG+/jixgAfNPI50=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Yhw4X1lQIVawkE4akuZu99ipUYMW7K6D717d6qR+vot6m2D7yK22o09bPRMytolMQ L7OI9AXt2uXrpSqB34qWEy4QY0zT/vBK8cgvdNL6+94x7X3OrdEClf8r1UTgfLoj+H NVYqW5l/1UnBNzADcAv2T7b3KnDd8XCxmaH6LmF0= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Wed, 22 Jan 2025 19:41:45 +0100 Subject: [PATCH 2/5] selftests/nolibc: drop call to prepare target Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250122-nolibc-config-v1-2-a697db968b49@weissschuh.net> References: <20250122-nolibc-config-v1-0-a697db968b49@weissschuh.net> In-Reply-To: <20250122-nolibc-config-v1-0-a697db968b49@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.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737571320; l=1035; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=yOnX0FgFgCBauRdniu/luUgUK6bKzG+/jixgAfNPI50=; b=xUSgaq+CBfe1W+ws87ZgQTUUg7OyhFgomVpjI652MuEBzynN5/krmpsBgjCk5zBesw5TDoPF7 NWbgWqBiF78AXYamqcJOUNRVeQbFIR8c+0oeNYVy0WSwYn62DcZzuKH X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= The "prepare" target does not need to be run manually. kbuild knows when to use it on its own and the target is not even documented. Signed-off-by: Thomas Weißschuh --- tools/testing/selftests/nolibc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index ba044c8a042ce345ff90bdd35569de4b5acd117d..464165e3d9175d283ec0ed14765df29427b6de38 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -261,7 +261,7 @@ initramfs: nolibc-test $(Q)cp nolibc-test initramfs/init defconfig: - $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) mrproper $(DEFCONFIG) prepare + $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) mrproper $(DEFCONFIG) kernel: $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) < /dev/null From patchwork Wed Jan 22 18:41:46 2025 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: 13947638 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60B91215773; Wed, 22 Jan 2025 18:42:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737571324; cv=none; b=m77sfj29fX2NOREul7ZfrGnlp17k3xSiSGv73EHdT380harg/9KphQ7OTlwf69kfOwsw5SHt+GHkLyj+Ef3kqTD1OzEZQ6Lp5qMYwpjtt0+RryVtn3OlWWooTAqXPiaEJo66x5oqUh2PPoW5dBfn4gQhzWJrIW19TO7/Aqymb5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737571324; c=relaxed/simple; bh=b3ngHEymh1xN/jzU2pxJXFVn1ST1gsxBzlNsnsYEeLc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sDiElwHT6HkLxACSeB0xnfxjJVcqoTtdlBn8nkIpAdK55myEIA78w5iWFwAQmcnjPDd3XkYFN6qYLZIfRNeqI0TzvjQMIMrRLw2VN4oaRd5KZZ0So+aeWaHGOFYKnotXxIrs4ngV62rAOFVyJr/Os9ncNpt3cKas/eim4XJ79Ls= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=E6Gqx4xU; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="E6Gqx4xU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1737571320; bh=b3ngHEymh1xN/jzU2pxJXFVn1ST1gsxBzlNsnsYEeLc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=E6Gqx4xUAw/nOSnNzu/nzhj1Bov82hFQ+0kjshS/3sY8b0Q5TeeTJbzgDWMp+npbZ +utS/WWf9KDb3gCNGupOy+t0s2luw37L1sIl820u6YGhlX1/8vWwvoAtX+/IrTk/ZE iT94L4RVdLNFpvob/g5dIqi2Qu2T6x8nY0YACmAY= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Wed, 22 Jan 2025 19:41:46 +0100 Subject: [PATCH 3/5] selftests/nolibc: drop call to mrproper target Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250122-nolibc-config-v1-3-a697db968b49@weissschuh.net> References: <20250122-nolibc-config-v1-0-a697db968b49@weissschuh.net> In-Reply-To: <20250122-nolibc-config-v1-0-a697db968b49@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.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737571320; l=1060; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=b3ngHEymh1xN/jzU2pxJXFVn1ST1gsxBzlNsnsYEeLc=; b=upscAaF1MGkrY26FFOH3e0YcfJGy35xUUtXZ+YLVD3Ty851wh32k1sDA78rJLaxvUDevFkHVt TNRvuCNu+70B7DP0IE99LdAyRj5fDz48N2gd0gpEzi90eG9Dy0nUNcs X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= "mrproper" unnecessarily cleans a lot of files. kbuild is smart enough to handle changed configurations, so the cleanup is not necessary and only leads to excessive rebuilds. Signed-off-by: Thomas Weißschuh --- tools/testing/selftests/nolibc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index 464165e3d9175d283ec0ed14765df29427b6de38..d3afb71b4c6b7fc51b89f034c826692e76122864 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -261,7 +261,7 @@ initramfs: nolibc-test $(Q)cp nolibc-test initramfs/init defconfig: - $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) mrproper $(DEFCONFIG) + $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(DEFCONFIG) kernel: $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) < /dev/null From patchwork Wed Jan 22 18:41:47 2025 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: 13947636 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE0F021576C; Wed, 22 Jan 2025 18:42:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737571324; cv=none; b=kr5JYASP4SLsiKnBsK6jN5tjmQMmWvfLyX0GHjZ8TRhf5LLBr0RnfyVot9S7qsIeZyOw+ceJaQu8kjXBH9ns5VufYAbJ+doi4OlcainQ2NIwp0u74jTA38NDdAZG8Ule+1lFrU7sUSRAGd5MmFumSJ1tCcXqNuS+exNcrArfJ/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737571324; c=relaxed/simple; bh=9GeYmwk11CHz23eY62uR618gIEclqpJRQ3rArk0tRVw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rINqWHtcaU74i89muvEp1vMGJ/c2F+PkRvuyxI7u5z4frXGmK6GwBb9GYW9bb19ZRIgTDkp9zNLsdXGepOr71NBqfY+vDZrNiE5mCE4CzK+xKtNMTvpmTRbRXlQ57IjQBGEpRUnX+la1tld0yswlJOpwhx9Z8VnSiX0FYzyCA1c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=Qupcj2YC; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="Qupcj2YC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1737571320; bh=9GeYmwk11CHz23eY62uR618gIEclqpJRQ3rArk0tRVw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Qupcj2YC5B6P1xeCDcwn30bbTx4TkBA15l2oJj2RPbzW3b3WnxXeBJv9ls4Mfhq0P KZcaB4WOq49rjfYUuMOWRnBa0iGo9F7TTJd77LNQHhPrKHXuDV2LZpC5rYk6NaFNag OxXHMxpEntV/xx7y+u3vuDUjIMv+c0fUpky11bc0= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Wed, 22 Jan 2025 19:41:47 +0100 Subject: [PATCH 4/5] selftests/nolibc: execute defconfig before other targets Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250122-nolibc-config-v1-4-a697db968b49@weissschuh.net> References: <20250122-nolibc-config-v1-0-a697db968b49@weissschuh.net> In-Reply-To: <20250122-nolibc-config-v1-0-a697db968b49@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.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737571320; l=1613; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=9GeYmwk11CHz23eY62uR618gIEclqpJRQ3rArk0tRVw=; b=Qvg+YT6uq1ydThNZf7zdp6qrSWMq4rfqLqzrUfP0co9gn/xE7UtcSruDnYxaX06E7wTDyw4M6 xJKClTwFKwJCIwEuubOeYkypK0mjHMnUL2TfkCXTd+zd1TrYmmUwxY3 X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Some targets use the test kernel configuration. Executing defconfig in the same make invocation as those targets results in errors as the configuration may be in an inconsistent state during reconfiguration. Avoid this by introducing ordering dependencies between the defconfig and some other targets. Signed-off-by: Thomas Weißschuh --- tools/testing/selftests/nolibc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index d3afb71b4c6b7fc51b89f034c826692e76122864..b74fa74e5ce296f032bec76ce9b3f5a3debe2b40 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -217,7 +217,7 @@ all: run sysroot: sysroot/$(ARCH)/include -sysroot/$(ARCH)/include: +sysroot/$(ARCH)/include: | defconfig $(Q)rm -rf sysroot/$(ARCH) sysroot/sysroot $(QUIET_MKDIR)mkdir -p sysroot $(Q)$(MAKE) -C $(srctree) outputmakefile @@ -263,10 +263,10 @@ initramfs: nolibc-test defconfig: $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(DEFCONFIG) -kernel: +kernel: | defconfig $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) < /dev/null -kernel-standalone: initramfs +kernel-standalone: initramfs | defconfig $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) CONFIG_INITRAMFS_SOURCE=$(CURDIR)/initramfs < /dev/null # run the tests after building the kernel From patchwork Wed Jan 22 18:41:48 2025 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: 13947641 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C840216387; Wed, 22 Jan 2025 18:42:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737571327; cv=none; b=g+DTcUiUGRr+fHD5rMdoHZCtiiKMW9IyPxx2mT/8d3hVXVYbK1iC29MWMH69PqiPNUor+IjUTlzkKDdCdlJPsqz9DR3h67ksFUbCc8WWPL7oRoqsbL/L4hIYLcNxKKuDUVLbeFYgY43vESIOMpXfVPkGdVq7VSI1AgTM5s4m9nU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737571327; c=relaxed/simple; bh=A8K4kEnALbhaK90EA/QltWvvng/sBatsp6gsx3xoPh4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bzClJHJcPkR2+RTjSHChc0xvxZVQXq6AgoS0SVUI8f85t3ZMQH8Zx/LA7ApijCUWTgvFXibK6MZeqsFdTIKDGT8xZze9M7UFAAONub+oeLzWtoL1HhWu6ZDoBMRgUl/o+3aQ/KDwrCp3VO7ilzx9aMtYEbkiWDgp2F9GoYGyCH8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=AyIfI0C3; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="AyIfI0C3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1737571320; bh=A8K4kEnALbhaK90EA/QltWvvng/sBatsp6gsx3xoPh4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AyIfI0C34xeeNJHWJsElgrr+J0AnfY+KBDV1oSoA5cg6FsTKrqhZXqZ48HW9tkp9m Rp5euPGHpkvum7SIX3UqcbU9expQXe5R2PfJUcWi3XnvVZ9iEzzRBTycPdInAA/uwq EKAZ/HNiqb+mYYsdKhUoPKOM2TsrCeTv1B5bCQOA= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Wed, 22 Jan 2025 19:41:48 +0100 Subject: [PATCH 5/5] selftests/nolibc: always keep test kernel configuration up to date Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250122-nolibc-config-v1-5-a697db968b49@weissschuh.net> References: <20250122-nolibc-config-v1-0-a697db968b49@weissschuh.net> In-Reply-To: <20250122-nolibc-config-v1-0-a697db968b49@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.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737571320; l=1321; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=A8K4kEnALbhaK90EA/QltWvvng/sBatsp6gsx3xoPh4=; b=gihzhLPvfLe4M4KsafiLgYBONMRevk/riZj1XdcMGHvpkPw8mnF4ciB6TmligMzBORWq90IZ1 dYrK0AVLgNQC1QqE9+nx6j2d7kv6bkvcROjVMUyCmSRJxfSJFdnk25z X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Avoid using a stale test kernel configuration by always synchronizing it to the current source tree. kbuild is smart enough to avoid spurious rebuilds. Signed-off-by: Thomas Weißschuh --- tools/testing/selftests/nolibc/run-tests.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/testing/selftests/nolibc/run-tests.sh b/tools/testing/selftests/nolibc/run-tests.sh index 9c5160c5388122deeeb59ecfced7633000d69b10..664f92e1c5500f726ab33247321b96e8602ce185 100755 --- a/tools/testing/selftests/nolibc/run-tests.sh +++ b/tools/testing/selftests/nolibc/run-tests.sh @@ -158,9 +158,6 @@ test_arch() { MAKE=(make -j"${nproc}" XARCH="${arch}" CROSS_COMPILE="${cross_compile}" LLVM="${llvm}" O="${build_dir}") mkdir -p "$build_dir" - if [ "$test_mode" = "system" ] && [ ! -f "${build_dir}/.config" ]; then - swallow_output "${MAKE[@]}" defconfig - fi case "$test_mode" in 'system') test_target=run @@ -173,7 +170,7 @@ test_arch() { exit 1 esac printf '%-15s' "$arch:" - swallow_output "${MAKE[@]}" CFLAGS_EXTRA="$CFLAGS_EXTRA" "$test_target" V=1 + swallow_output "${MAKE[@]}" CFLAGS_EXTRA="$CFLAGS_EXTRA" defconfig "$test_target" V=1 cp run.out run.out."${arch}" "${MAKE[@]}" report | grep passed }