7696248f9b
commit 211929fd3f7c8de4d541b1cc243b82830e5ea1e8 upstream. Commitb2d35fa5fc("selftests: add headers_install to lib.mk") added khdr target to run headers_install target from the main Makefile. The logic uses KSFT_KHDR_INSTALL and top_srcdir as controls to initialize variables and include files to run headers_install from the top level Makefile. There are a few problems with this logic. 1. Exposes top_srcdir to all tests 2. Common logic impacts all tests 3. Uses KSFT_KHDR_INSTALL, top_srcdir, and khdr in an adhoc way. Tests add "khdr" dependency in their Makefiles to TEST_PROGS_EXTENDED in some cases, and STATIC_LIBS in other cases. This makes this framework confusing to use. The common logic that runs for all tests even when KSFT_KHDR_INSTALL isn't defined by the test. top_srcdir is initialized to a default value when test doesn't initialize it. It works for all tests without a sub-dir structure and tests with sub-dir structure fail to build. e.g: make -C sparc64/drivers/ or make -C drivers/dma-buf ../../lib.mk:20: ../../../../scripts/subarch.include: No such file or directory make: *** No rule to make target '../../../../scripts/subarch.include'. Stop. There is no reason to require all tests to define top_srcdir and there is no need to require tests to add khdr dependency using adhoc changes to TEST_* and other variables. Fix it with a consistent use of KSFT_KHDR_INSTALL and top_srcdir from tests that have the dependency on headers_install. Change common logic to include khdr target define and "all" target with dependency on khdr when KSFT_KHDR_INSTALL is defined. Only tests that have dependency on headers_install have to define just the KSFT_KHDR_INSTALL, and top_srcdir variables and there is no need to specify khdr dependency in the test Makefiles. Fixes:b2d35fa5fc("selftests: add headers_install to lib.mk") Cc: stable@vger.kernel.org Signed-off-by: Shuah Khan <shuah@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
30 lines
837 B
Makefile
30 lines
837 B
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
TEST_PROGS := gpio-mockup.sh
|
|
TEST_FILES := gpio-mockup-sysfs.sh $(BINARIES)
|
|
BINARIES := gpio-mockup-chardev
|
|
EXTRA_PROGS := ../gpiogpio-event-mon ../gpiogpio-hammer ../gpiolsgpio
|
|
EXTRA_DIRS := ../gpioinclude/
|
|
EXTRA_OBJS := ../gpiogpio-event-mon-in.o ../gpiogpio-event-mon.o
|
|
EXTRA_OBJS += ../gpiogpio-hammer-in.o ../gpiogpio-utils.o ../gpiolsgpio-in.o
|
|
EXTRA_OBJS += ../gpiolsgpio.o
|
|
|
|
KSFT_KHDR_INSTALL := 1
|
|
include ../lib.mk
|
|
|
|
all: $(BINARIES)
|
|
|
|
override define CLEAN
|
|
$(RM) $(BINARIES) $(EXTRA_PROGS) $(EXTRA_OBJS)
|
|
$(RM) -r $(EXTRA_DIRS)
|
|
endef
|
|
|
|
CFLAGS += -O2 -g -std=gnu99 -Wall -I../../../../usr/include/
|
|
LDLIBS += -lmount -I/usr/include/libmount
|
|
|
|
$(BINARIES):| khdr
|
|
$(BINARIES): ../../../gpio/gpio-utils.o
|
|
|
|
../../../gpio/gpio-utils.o:
|
|
make ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C ../../../gpio
|