]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
selftests/nolibc: deduplicate invocations of toplevel Makefile
authorThomas Weißschuh <linux@weissschuh.net>
Sat, 19 Jul 2025 15:38:27 +0000 (17:38 +0200)
committerThomas Weißschuh <linux@weissschuh.net>
Mon, 18 Aug 2025 14:05:40 +0000 (16:05 +0200)
Various targets of the testsuite call back into the toplevel kernel
Makefile. These calls use various parameters and are quite long.

Introduce a common variable to make future changes smaller and the lines
shorter.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250719-nolibc-llvm-system-v1-1-1730216ce171@weissschuh.net
tools/testing/selftests/nolibc/Makefile.nolibc

index b013a5d724c9afd2afbc9ae9f1e526bf12821305..d8dbb63fe4f78ad1b92258482aefc7536a823961 100644 (file)
@@ -262,6 +262,9 @@ REPORT  ?= awk '/\[OK\][\r]*$$/{p++} /\[FAIL\][\r]*$$/{if (!f) printf("\n"); f++
                if (f || !p || !done) printf("failure\n"); else if (s) printf("warning\n"); else printf("success\n");; \
                printf("\nSee all results in %s\n", ARGV[1]); }'
 
+# Execute the toplevel kernel Makefile
+KBUILD_MAKE = $(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE)
+
 help:
        @echo "Supported targets under selftests/nolibc:"
        @echo "  all               call the \"run\" target below"
@@ -340,17 +343,17 @@ initramfs: nolibc-test
        $(Q)cp nolibc-test initramfs/init
 
 defconfig:
-       $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(DEFCONFIG)
+       $(Q)$(KBUILD_MAKE) $(DEFCONFIG)
        $(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; \
+               $(KBUILD_MAKE) olddefconfig < /dev/null; \
        fi
 
 kernel:
-       $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) < /dev/null
+       $(Q)$(KBUILD_MAKE) $(IMAGE_NAME) < /dev/null
 
 kernel-standalone: initramfs
-       $(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) CONFIG_INITRAMFS_SOURCE=$(CURDIR)/initramfs < /dev/null
+       $(Q)$(KBUILD_MAKE) $(IMAGE_NAME) CONFIG_INITRAMFS_SOURCE=$(CURDIR)/initramfs < /dev/null
 
 # run the tests after building the kernel
 run: kernel initramfs.cpio