From patchwork Thu Jan 23 07:37:37 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: 13947973 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 5163920B7ED; Thu, 23 Jan 2025 07:38:44 +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=1737617926; cv=none; b=DqD9Yclci5PDrgM69kYUPFl78ObvpvfeKvSiYVklSgKL/XyJk11Yw3AJX6FUIS0TAShwBgfVKvjaBJGZiibb2b6l8VdLhn0jYMIgcG5S2I/UqwXKxk8WnncFkOaSxTNatq64S2U5LcLNe9kq7qQZh95nU5G73I3UDPUx8JulIOk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737617926; c=relaxed/simple; bh=+CRDay+53YjmjDUoZr23NQjukGzwcpQV4L/S0QarAVc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uYwO/9vhTJ6abHj3fP4muHxhAnevH1KXXu8w6oTTWvNlRCe5t04lJMg5stF7XjPGFe/VLK++m6O30dEGlJayNUhp7vFDCbiIT6zna5sybgahShwm7kaUSwNsY/QP0pOS+liow0fd4ofyAW0oeLu1fp1/v22HDZmmApxJcwpUh/Y= 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=GfmjJ+LR; 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="GfmjJ+LR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1737617921; bh=+CRDay+53YjmjDUoZr23NQjukGzwcpQV4L/S0QarAVc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GfmjJ+LRO26YcxShVTAzX2avf7gFXZN9OBhafKLV30HaLhdAtwPua7gMJ1zFYyeg+ rNr3CSqHfi3QZVhlJleiGijs1b/JHiCmFQocddNXSNQ7vsRQMi+kkDcBaJSRsRNyUG JPd0fm8+KXDE07p7WDGt9xHu3z3zPA83u4oKWsaQ= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Thu, 23 Jan 2025 08:37:37 +0100 Subject: [PATCH v2 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: <20250123-nolibc-config-v2-1-5701c35995d6@weissschuh.net> References: <20250123-nolibc-config-v2-0-5701c35995d6@weissschuh.net> In-Reply-To: <20250123-nolibc-config-v2-0-5701c35995d6@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=1737617921; l=1920; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=+CRDay+53YjmjDUoZr23NQjukGzwcpQV4L/S0QarAVc=; b=pXBfScCXbhj5BbPfc4tm1oCLMUvgcCrzA1sCxbH5neHMfbJd/5UjXc6JwJHR02Loo7GkVIi6Y e3uK/NR3IgKALWLlemhYX95l+5o2ehijsHRhq2MSsGIidtpSvtNhpcn 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 Thu Jan 23 07:37:38 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: 13947975 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 930E820B7EE; Thu, 23 Jan 2025 07:38:44 +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=1737617927; cv=none; b=oY2XDd6T6bigNL+iKb8CBi/VvuBHCn2arArbLyuI9pKUpaxslKkhpcOZ/xUgrb5aMDYlhR9tUpsyjwQ1+Q5OD0LPdBsV6olCKceU0sdRutFEwRSqxHpfqX008BGgRlY0OmLi4Vwg+6oJqfrhIzY/bjAPOZYbVwCWHif8w/4lP6Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737617927; c=relaxed/simple; bh=yOnX0FgFgCBauRdniu/luUgUK6bKzG+/jixgAfNPI50=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q3+gAjiTUJ+ua7E9w7LgaDstvIdIsufnq4MhWsxGlKYfdif4mdrVTBC5uViNKRbbucMZFtWD6QlYIUbo1A28Fn2Tnv5XOHQ5jUdnxo+op28SS6ruv2U6wyJvObtXQUhqsv1WpWXqs6jKSBo979otHHYkWeuidmpKLA6TpLUIJ2Q= 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=fdhoS1nm; 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="fdhoS1nm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1737617921; bh=yOnX0FgFgCBauRdniu/luUgUK6bKzG+/jixgAfNPI50=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fdhoS1nmZfFxvT+Jdb647NmhVwOUnbWTeoJGXWVB5gJUQIS/5yAjk/6nOG60Ely+h qhubgWL8WeLpah5Zcdyvhui9d8nl6w9l8s3JBtMdXpUqfzTnBfZJ3Ut/sHf5BVXuTp oGdpsXzOL8BXD/9H1xIKlZvdK4VezD6vN2zqQOXE= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Thu, 23 Jan 2025 08:37:38 +0100 Subject: [PATCH v2 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: <20250123-nolibc-config-v2-2-5701c35995d6@weissschuh.net> References: <20250123-nolibc-config-v2-0-5701c35995d6@weissschuh.net> In-Reply-To: <20250123-nolibc-config-v2-0-5701c35995d6@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=1737617921; l=1035; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=yOnX0FgFgCBauRdniu/luUgUK6bKzG+/jixgAfNPI50=; b=3c3uXajMzIEqHCg6W0c2KbmDdcMvWn+p61TmFTJg3H1DTmZ3W6Gsms5EHmTICryzj8FYmRdTM JR/6W1zh6nsCGAtoHkJiv1tCQ99IOWcc1GZOmKncQqVaU7vYiCm/UQ6 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 Thu Jan 23 07:37:39 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: 13947971 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 096A3179A7; Thu, 23 Jan 2025 07:38:43 +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=1737617926; cv=none; b=Q5nctK6M4FUydkKCMkY9vijZt5wDMauDCWyEn5tMUysWrG/eocEQkrfyJMPPCH/++++cCNzSoygl0k4AxSbWLk8rW2S5fsNskz31PuKA2UNLnAgSSWPoHuteY+nKDcByQ9wMQ/UwI77MgBGBFChT0yRwx0ZdXlOmzHhBlCVeTnU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737617926; c=relaxed/simple; bh=b3ngHEymh1xN/jzU2pxJXFVn1ST1gsxBzlNsnsYEeLc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=frg6xFTsOlMBfXsp9Nw79PHL22JrS3Mg/lw1VJ4S2IejsvQPdwpcr6Z0mweldakUjKc+23nj/vuJM3ZWolfSaBkSwyEiIKEt8aH7/imKrNfvUczT3OcK9PdTvYmbIZOKLARiJ2HWzhSPhqC5q5anaCpuy5G+0qqtOj0CknmGiz0= 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=Uyvw2/KG; 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="Uyvw2/KG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1737617921; bh=b3ngHEymh1xN/jzU2pxJXFVn1ST1gsxBzlNsnsYEeLc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Uyvw2/KGJUaK7S6PTi7nh18gLx3/3ys1adigTBzEmYU2++v4aJ7N27vsdTfS3awXn nG4M/Nq7aRxCJ77RVvxRNcraCkUfykn/SSRlhHgtyy9QTjditVAhgwrs2haaZzk2JK jJ1sKmCeFUGmU3MkG4UFrQQ19GyhYg273qjHNtug= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Thu, 23 Jan 2025 08:37:39 +0100 Subject: [PATCH v2 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: <20250123-nolibc-config-v2-3-5701c35995d6@weissschuh.net> References: <20250123-nolibc-config-v2-0-5701c35995d6@weissschuh.net> In-Reply-To: <20250123-nolibc-config-v2-0-5701c35995d6@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=1737617921; l=1060; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=b3ngHEymh1xN/jzU2pxJXFVn1ST1gsxBzlNsnsYEeLc=; b=9h1P0DTnjCiXPcYVsKNxBWxZJ7azaKGsq8ag6l7xwjUtxP27Y1O8NdiGdbnEUW11btiP88OEt Li2AuMJYFftCDcqNKaFdgt1tanUlpMdoht4JZesjxDYytjZFN4mmlrd 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 Thu Jan 23 07:37:40 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: 13947976 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 DCEF520B816; Thu, 23 Jan 2025 07:38:47 +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=1737617929; cv=none; b=pf5EDFpYMoxqjL4Z2fSLQwt36s/xyJo/lv/jGP44S6wA/BvcbUrU9r33ueCNc6QLC830uUd/UvdBSMWDm9ZkMvy8/yC7XLBiMtW1cZQWyZPU0YJ1R57OLlnMIhMNuxG/GMl1/wUK3usTuZuXa/tAjK4ZwJRAvEH1dX106k6c6hU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737617929; c=relaxed/simple; bh=9GeYmwk11CHz23eY62uR618gIEclqpJRQ3rArk0tRVw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q4VIWj6V8p4Vksna/xnEce7LAsKsRf6Sr6rpTyQHzt+TB46LeqvASA66/Z5Wrg8LF2f0TuLF6+NvYRdg+Dq5rqywmChP4wHGHXdNtwxn47zMOYI2CFIUYvxNsYUlyfOSY2sZUjt3yEJMVURYfBF8xymMWaUBCzcdXXqzTao9+JU= 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=KTcAVjbg; 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="KTcAVjbg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1737617921; bh=9GeYmwk11CHz23eY62uR618gIEclqpJRQ3rArk0tRVw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=KTcAVjbgfCMLhPGVPLb0PcQE0gRrZy1lX1hITR8wN8wU9JGU8XGs1Dch+ZPhQZ3zg 7sq59r0++zLTJ09mWjz7u58NXiCBJA5UlkRcEjXZVhQKIXFIAlXGeUwMgOfh+fimKL dLVAqBdzMBFy2aaPXhCloqhzMnIjbady2Nk+TRsQ= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Thu, 23 Jan 2025 08:37:40 +0100 Subject: [PATCH v2 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: <20250123-nolibc-config-v2-4-5701c35995d6@weissschuh.net> References: <20250123-nolibc-config-v2-0-5701c35995d6@weissschuh.net> In-Reply-To: <20250123-nolibc-config-v2-0-5701c35995d6@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=1737617921; l=1613; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=9GeYmwk11CHz23eY62uR618gIEclqpJRQ3rArk0tRVw=; b=3jh+uc6/t4zBWyVo2jlfXrohcWlTxbsrzxuMdAoQuotCCKzwDVU2rOGcXiVfDKvA2UJYPgjYJ h1fJ08NhxYbDKY+iRdXzTMoJbFSH+VcMCIMdols73jP57cfK8mLZEul 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 Thu Jan 23 07:37:41 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: 13947972 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 515C520B20C; Thu, 23 Jan 2025 07:38:44 +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=1737617926; cv=none; b=ECs+wIA8EA5tPFVJdXbyjEmdOmtNYSGqmPTgSsgZiFO3FJVYztnqr2pKjykTSrWpMVd3fPJQFZZM9dHkWk9JK26g2S7/3TDMvcUsZgb+ATBQk7ghpHcNuVKOWh16B1xaHjMC/71bkXg4F05Ef1eUz8wt/21Rf8knNhY4AWq6qjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737617926; c=relaxed/simple; bh=9MQKEZ+KYBbKL921eHv4MEZPDGOiiotIz3Y9gDktJ+Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=N6bJJDe2V9z3r0Xefcme0PKhSke/CARrSbwTPiO7D5uC/fOaIrDLaNPkrTCQZlnQiM43AfGjPWehwAbAOzfUu+uXqaDBbQBhsHOha+I5j3nVeh7ic9NvEdAP+qtUGfDynmHA67HB/FbE+6E/k6IqNxssLiuRGrv6u34v7Ir6ca4= 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=i1kRCOHZ; 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="i1kRCOHZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1737617922; bh=9MQKEZ+KYBbKL921eHv4MEZPDGOiiotIz3Y9gDktJ+Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=i1kRCOHZ3xM8WzO8hLKyxQEclOG7VI/PWk1ALSsOJIZEB+5y4S4lRNfOyL2lx0bKJ yTi1v4RQEwUcFs0W++aJCiE2MrFB2oawpHE3v0dQSTamH1Hl1NWukiFbf1RRqKS1DZ GMZHVo/bA0o8KIQgFR2PSnpomn/0EB7MPPW5yeLs= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Thu, 23 Jan 2025 08:37:41 +0100 Subject: [PATCH v2 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: <20250123-nolibc-config-v2-5-5701c35995d6@weissschuh.net> References: <20250123-nolibc-config-v2-0-5701c35995d6@weissschuh.net> In-Reply-To: <20250123-nolibc-config-v2-0-5701c35995d6@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=1737617921; l=1394; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=9MQKEZ+KYBbKL921eHv4MEZPDGOiiotIz3Y9gDktJ+Y=; b=hARrXcoey0594PQiIvLMgPcqgy0PUuC8pd9Znkgk5uSkvG1MMf4RfPaB+eMjyc1cu+OVrBXn0 4RBvWEHM9niD/rlGSYX5H8lwQ5TpDYQYqzcf72NWj4ukLTnLi8cWRgJ 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. Shuffle the code around a bit to keep all the commands with side-effects together. Signed-off-by: Thomas Weißschuh --- tools/testing/selftests/nolibc/run-tests.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/nolibc/run-tests.sh b/tools/testing/selftests/nolibc/run-tests.sh index 9c5160c5388122deeeb59ecfced7633000d69b10..bc4e92b4f1b98278a0a72345a5cd67f1a429b6a2 100755 --- a/tools/testing/selftests/nolibc/run-tests.sh +++ b/tools/testing/selftests/nolibc/run-tests.sh @@ -157,10 +157,6 @@ test_arch() { fi 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,6 +169,9 @@ test_arch() { exit 1 esac printf '%-15s' "$arch:" + + mkdir -p "$build_dir" + swallow_output "${MAKE[@]}" defconfig swallow_output "${MAKE[@]}" CFLAGS_EXTRA="$CFLAGS_EXTRA" "$test_target" V=1 cp run.out run.out."${arch}" "${MAKE[@]}" report | grep passed