[tip:,locking/core] selftests: futex: Correctly include headers dirs
diff mbox series

Message ID 162084540802.29796.2191659704209594178.tip-bot2@tip-bot2
State In Next
Commit c7d84e7ff5a651d186a6ec41361c4f07acc2fb9c
Headers show
  • [tip:,locking/core] selftests: futex: Correctly include headers dirs
Related show

Commit Message

tip-bot2 for Vincent Donnefort May 12, 2021, 6:50 p.m. UTC
The following commit has been merged into the locking/core branch of tip:

Commit-ID:     c7d84e7ff5a651d186a6ec41361c4f07acc2fb9c
Gitweb:        https://git.kernel.org/tip/c7d84e7ff5a651d186a6ec41361c4f07acc2fb9c
Author:        André Almeida <andrealmeid@collabora.com>
AuthorDate:    Tue, 27 Apr 2021 10:53:27 -03:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 12 May 2021 20:44:58 +02:00

selftests: futex: Correctly include headers dirs

When building selftests, the build system will install uapi linux
headers at usr/include in kernel source's root directory. When building
with a different output folder, the headers will be installed at

Add both paths so we can build the tests using up-to-date headers.

Currently, this is uncommon to happen since it's rare to find a
build system with an outdated futex header, but it happens
when testing new futex operations.

Signed-off-by: André Almeida <andrealmeid@collabora.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210427135328.11013-2-andrealmeid@collabora.com
 tools/testing/selftests/futex/functional/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff mbox series

diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile
index 2320782..1d2b3b2 100644
--- a/tools/testing/selftests/futex/functional/Makefile
+++ b/tools/testing/selftests/futex/functional/Makefile
@@ -1,5 +1,6 @@ 
 # SPDX-License-Identifier: GPL-2.0
-INCLUDES := -I../include -I../../
+INCLUDES := -I../include -I../../ -I../../../../../usr/include/ \
+	-I$(KBUILD_OUTPUT)/kselftest/usr/include
 CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES)
 LDLIBS := -lpthread -lrt