diff options
author | Daniel Díaz <daniel.diaz@linaro.org> | 2018-09-07 10:34:55 -0400 |
---|---|---|
committer | Shuah Khan (Samsung OSG) <shuah@kernel.org> | 2018-10-24 16:49:37 -0400 |
commit | 8c7f6316fccf38ca45d33ed658cc4813837b6294 (patch) | |
tree | 86e44d1047fbfa750ef0f8acdc75443740b56f33 /tools/testing | |
parent | a4f222e000b3f75bd1ab763dcc289d004ff6596e (diff) |
selftests: gpio: Fix OUTPUT directory in Makefile
When simply running `make' from the selftests top dir, this
error shows up:
cc -O2 -g -std=gnu99 -Wall -I../../../../usr/include/ -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid gpio-mockup-chardev.c ../../../gpio/gpio-utils.o -lmount -o gpio-mockup-chardev
cc: error: ../../../gpio/gpio-utils.o: No such file or directory
<builtin>: recipe for target 'gpio-mockup-chardev' failed
make[1]: *** [gpio-mockup-chardev] Error 1
because the output directory is set to "selftests/gpio" and
all binaries built from ../../../gpio/ end up there. In fact,
they appear as, exempli gratia:
* gpiogpio-event-mon
* gpiogpio-hammer
* gpioinclude/
* gpiolsgpio
which is wrong, as it's missing a directory separator
somewhere.
This patch sets straight the output directory when building
../../../gpio/ so that binaries don't cross paths.
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
Diffstat (limited to 'tools/testing')
-rw-r--r-- | tools/testing/selftests/gpio/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/testing/selftests/gpio/Makefile b/tools/testing/selftests/gpio/Makefile index a4a01ec8b2a5..46648427d537 100644 --- a/tools/testing/selftests/gpio/Makefile +++ b/tools/testing/selftests/gpio/Makefile | |||
@@ -7,7 +7,7 @@ TEST_PROGS := gpio-mockup.sh | |||
7 | TEST_FILES := gpio-mockup-sysfs.sh | 7 | TEST_FILES := gpio-mockup-sysfs.sh |
8 | TEST_PROGS_EXTENDED := gpio-mockup-chardev | 8 | TEST_PROGS_EXTENDED := gpio-mockup-chardev |
9 | 9 | ||
10 | GPIODIR := ../../../gpio | 10 | GPIODIR := $(realpath ../../../gpio) |
11 | GPIOOBJ := gpio-utils.o | 11 | GPIOOBJ := gpio-utils.o |
12 | 12 | ||
13 | include ../lib.mk | 13 | include ../lib.mk |
@@ -16,11 +16,11 @@ all: $(TEST_PROGS_EXTENDED) | |||
16 | 16 | ||
17 | override define CLEAN | 17 | override define CLEAN |
18 | $(RM) $(TEST_PROGS_EXTENDED) | 18 | $(RM) $(TEST_PROGS_EXTENDED) |
19 | $(MAKE) -C $(GPIODIR) clean | 19 | $(MAKE) -C $(GPIODIR) OUTPUT=$(GPIODIR)/ clean |
20 | endef | 20 | endef |
21 | 21 | ||
22 | $(TEST_PROGS_EXTENDED):| khdr | 22 | $(TEST_PROGS_EXTENDED):| khdr |
23 | $(TEST_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ) | 23 | $(TEST_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ) |
24 | 24 | ||
25 | $(GPIODIR)/$(GPIOOBJ): | 25 | $(GPIODIR)/$(GPIOOBJ): |
26 | $(MAKE) -C $(GPIODIR) | 26 | $(MAKE) OUTPUT=$(GPIODIR)/ -C $(GPIODIR) |