All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
To: Shuah Khan <shuah@kernel.org>,
	linux-kselftest@vger.kernel.org, Ingo Molnar <mingo@redhat.com>
Cc: linux-kernel@vger.kernel.org,
	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
	stable@vger.kernel.org
Subject: [PATCH 17/34] selftests: net: Fix incorrect kernel headers search path
Date: Fri, 27 Jan 2023 08:57:38 -0500	[thread overview]
Message-ID: <20230127135755.79929-18-mathieu.desnoyers@efficios.com> (raw)
In-Reply-To: <20230127135755.79929-1-mathieu.desnoyers@efficios.com>

Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents
building against kernel headers from the build environment in scenarios
where kernel headers are installed into a specific output directory
(O=...).

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: linux-kselftest@vger.kernel.org
Cc: Ingo Molnar <mingo@redhat.com>
Cc: <stable@vger.kernel.org>    [5.18+]
---
 tools/testing/selftests/net/Makefile             | 2 +-
 tools/testing/selftests/net/bpf/Makefile         | 2 +-
 tools/testing/selftests/net/mptcp/Makefile       | 2 +-
 tools/testing/selftests/net/openvswitch/Makefile | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile
index 3007e98a6d64..bab1222c7d50 100644
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@ -2,7 +2,7 @@
 # Makefile for net selftests
 
 CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g
-CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES)
+CFLAGS += $(KHDR_INCLUDES)
 
 TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh \
 	      rtnetlink.sh xfrm_policy.sh test_blackhole_dev.sh
diff --git a/tools/testing/selftests/net/bpf/Makefile b/tools/testing/selftests/net/bpf/Makefile
index 4abaf16d2077..207b6b958f66 100644
--- a/tools/testing/selftests/net/bpf/Makefile
+++ b/tools/testing/selftests/net/bpf/Makefile
@@ -7,7 +7,7 @@ BPFDIR := $(abspath ../../../lib/bpf)
 APIDIR := $(abspath ../../../include/uapi)
 
 CCINCLUDE += -I../../bpf
-CCINCLUDE += -I../../../../../usr/include/
+CCINCLUDE += $(KHDR_INCLUDES)
 CCINCLUDE += -I$(SCRATCH_DIR)/include
 
 BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a
diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile
index 43a723626126..06bba013bcef 100644
--- a/tools/testing/selftests/net/mptcp/Makefile
+++ b/tools/testing/selftests/net/mptcp/Makefile
@@ -2,7 +2,7 @@
 
 top_srcdir = ../../../../..
 
-CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES)
+CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g $(KHDR_INCLUDES)
 
 TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \
 	      simult_flows.sh mptcp_sockopt.sh userspace_pm.sh
diff --git a/tools/testing/selftests/net/openvswitch/Makefile b/tools/testing/selftests/net/openvswitch/Makefile
index 2f1508abc826..41ddfa9fdd1d 100644
--- a/tools/testing/selftests/net/openvswitch/Makefile
+++ b/tools/testing/selftests/net/openvswitch/Makefile
@@ -2,7 +2,7 @@
 
 top_srcdir = ../../../../..
 
-CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES)
+CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g $(KHDR_INCLUDES)
 
 TEST_PROGS := openvswitch.sh
 
-- 
2.25.1


  parent reply	other threads:[~2023-01-27 13:59 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-27 13:57 [PATCH 00/34] selftests: Fix incorrect kernel headers search path Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 01/34] selftests: arm64: " Mathieu Desnoyers
2023-01-30 16:09   ` Shuah Khan
2023-01-30 16:09     ` Shuah Khan
2023-01-30 17:14     ` Catalin Marinas
2023-01-30 17:14       ` Catalin Marinas
2023-01-30 17:20       ` Shuah Khan
2023-01-30 17:20         ` Shuah Khan
2023-01-27 13:57 ` [PATCH 02/34] selftests: bpf: " Mathieu Desnoyers
2023-01-30 16:12   ` Shuah Khan
2023-01-30 16:26     ` Alexei Starovoitov
2023-01-30 17:00       ` Mathieu Desnoyers
2023-01-30 17:09         ` Shuah Khan
2023-01-27 13:57 ` [PATCH 03/34] selftests: clone3: " Mathieu Desnoyers
2023-01-30 16:15   ` Shuah Khan
2023-01-30 16:26     ` Christian Brauner
2023-01-27 13:57 ` [PATCH 04/34] selftests: core: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 05/34] selftests: dma: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 06/34] selftests: dmabuf-heaps: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 07/34] selftests: drivers: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 08/34] selftests: filesystems: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 09/34] selftests: futex: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 10/34] selftests: gpio: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 11/34] selftests: ipc: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 12/34] selftests: kcmp: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 13/34] selftests: media_tests: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 14/34] selftests: membarrier: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 15/34] selftests: mount_setattr: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 16/34] selftests: move_mount_set_group: " Mathieu Desnoyers
2023-01-27 13:57 ` Mathieu Desnoyers [this message]
2023-01-27 16:21   ` [PATCH 17/34] selftests: net: " Matthieu Baerts
2023-01-27 16:42     ` Mathieu Desnoyers
2023-01-30 16:24   ` Shuah Khan
2023-01-27 13:57 ` [PATCH 18/34] selftests: perf_events: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 19/34] selftests: pid_namespace: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 20/34] selftests: pidfd: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 21/34] selftests: powerpc: " Mathieu Desnoyers
2023-01-30 16:32   ` Shuah Khan
2023-01-30 16:32     ` Shuah Khan
2023-01-27 13:57 ` [PATCH 22/34] selftests: ptp: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 23/34] selftests: rseq: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 24/34] selftests: sched: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 25/34] selftests: seccomp: " Mathieu Desnoyers
2023-01-30 16:52   ` Shuah Khan
2023-01-27 13:57 ` [PATCH 26/34] selftests: sync: " Mathieu Desnoyers
2023-01-30 16:44   ` Shuah Khan
2023-01-30 16:51     ` Shuah Khan
2023-01-27 13:57 ` [PATCH 27/34] selftests: user_events: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 28/34] selftests: vm: " Mathieu Desnoyers
2023-01-30 16:55   ` Shuah Khan
2023-01-27 13:57 ` [PATCH 29/34] selftests: x86: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 30/34] selftests: bpf docs: Use installed " Mathieu Desnoyers
2023-01-30 16:57   ` Shuah Khan
2023-01-27 13:57 ` [PATCH 31/34] selftests: iommu: " Mathieu Desnoyers
2023-01-30 17:01   ` Shuah Khan
2023-01-30 17:05     ` Jason Gunthorpe
2023-01-27 13:57 ` [PATCH 32/34] selftests: memfd: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 33/34] selftests: ptrace: " Mathieu Desnoyers
2023-01-27 13:57 ` [PATCH 34/34] selftests: tdx: " Mathieu Desnoyers
2023-01-30 22:29 ` [PATCH 00/34] selftests: Fix incorrect " Shuah Khan
2023-01-30 22:29   ` Shuah Khan
2023-01-30 23:45   ` Alexei Starovoitov
2023-01-30 23:45     ` Alexei Starovoitov
2023-01-30 23:48     ` Shuah Khan
2023-01-30 23:48       ` Shuah Khan
2023-01-30 23:49       ` Alexei Starovoitov
2023-01-30 23:49         ` Alexei Starovoitov
2023-02-02  2:07   ` Shuah Khan
2023-02-02  2:07     ` Shuah Khan
2023-02-04  1:06     ` Shuah Khan
2023-02-04  1:06       ` Shuah Khan
2023-02-11  0:15       ` Shuah Khan
2023-02-11  0:15         ` Shuah Khan
2023-02-20  3:49 ` (subset) " Michael Ellerman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230127135755.79929-18-mathieu.desnoyers@efficios.com \
    --to=mathieu.desnoyers@efficios.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=shuah@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.