2021-04-27 13:55:12

by André Almeida

Subject: [PATCH 1/2] 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
kselftests/usr/include. 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 <[email protected]>
---
tools/testing/selftests/futex/functional/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile
index 23207829ec75..1d2b3b2a5b86 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

--
2.31.1

2021-05-12 20:12:34

by tip-bot2 for Haifeng Xu

Subject: [tip: locking/core] selftests: futex: Correctly include headers dirs

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 <[email protected]>
AuthorDate: Tue, 27 Apr 2021 10:53:27 -03:00
Committer: Ingo Molnar <[email protected]>
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
kselftests/usr/include.

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 <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
tools/testing/selftests/futex/functional/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

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