Skip to content

Commit 32042f6

Browse files
committed
selftests/nolibc: deduplicate invocations of toplevel Makefile
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
1 parent 2be3fd9 commit 32042f6

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

tools/testing/selftests/nolibc/Makefile.nolibc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,9 @@ REPORT ?= awk '/\[OK\][\r]*$$/{p++} /\[FAIL\][\r]*$$/{if (!f) printf("\n"); f++
262262
if (f || !p || !done) printf("failure\n"); else if (s) printf("warning\n"); else printf("success\n");; \
263263
printf("\nSee all results in %s\n", ARGV[1]); }'
264264

265+
# Execute the toplevel kernel Makefile
266+
KBUILD_MAKE = $(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE)
267+
265268
help:
266269
@echo "Supported targets under selftests/nolibc:"
267270
@echo " all call the \"run\" target below"
@@ -340,17 +343,17 @@ initramfs: nolibc-test
340343
$(Q)cp nolibc-test initramfs/init
341344

342345
defconfig:
343-
$(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(DEFCONFIG)
346+
$(Q)$(KBUILD_MAKE) $(DEFCONFIG)
344347
$(Q)if [ -n "$(EXTRACONFIG)" ]; then \
345348
$(srctree)/scripts/config --file $(objtree)/.config $(EXTRACONFIG); \
346-
$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) olddefconfig < /dev/null; \
349+
$(KBUILD_MAKE) olddefconfig < /dev/null; \
347350
fi
348351

349352
kernel:
350-
$(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) < /dev/null
353+
$(Q)$(KBUILD_MAKE) $(IMAGE_NAME) < /dev/null
351354

352355
kernel-standalone: initramfs
353-
$(Q)$(MAKE) -C $(srctree) ARCH=$(ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) $(IMAGE_NAME) CONFIG_INITRAMFS_SOURCE=$(CURDIR)/initramfs < /dev/null
356+
$(Q)$(KBUILD_MAKE) $(IMAGE_NAME) CONFIG_INITRAMFS_SOURCE=$(CURDIR)/initramfs < /dev/null
354357

355358
# run the tests after building the kernel
356359
run: kernel initramfs.cpio

0 commit comments

Comments
 (0)