linux-kselftest.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Toke Høiland-Jørgensen" <toke@redhat.com>
To: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
	Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
	Yonghong Song <yhs@fb.com>, Andrii Nakryiko <andriin@fb.com>,
	Doug Ledford <dledford@redhat.com>,
	Jason Gunthorpe <jgg@ziepe.ca>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	Jesper Dangaard Brouer <brouer@redhat.com>,
	John Fastabend <john.fastabend@gmail.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
	Shuah Khan <shuah@kernel.org>,
	netdev@vger.kernel.org, bpf@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org,
	linux-kselftest@vger.kernel.org,
	clang-built-linux@googlegroups.com
Subject: [PATCH bpf-next v3 03/11] selftests: Pass VMLINUX_BTF to runqslower Makefile
Date: Thu, 16 Jan 2020 14:22:15 +0100	[thread overview]
Message-ID: <157918093501.1357254.2594464485570114583.stgit@toke.dk> (raw)
In-Reply-To: <157918093154.1357254.7616059374996162336.stgit@toke.dk>

From: Toke Høiland-Jørgensen <toke@redhat.com>

Add a VMLINUX_BTF variable with the locally-built path when calling the
runqslower Makefile from selftests. This makes sure a simple 'make'
invocation in the selftests dir works even when there is no BTF information
for the running kernel. Because of the previous changes to the runqslower
Makefile, if no locally-built vmlinux file exists, the wildcard search will
fall back to the pre-defined paths (and error out if they don't exist).

Fixes: 3a0d3092a4ed ("selftests/bpf: Build runqslower from selftests")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
 tools/testing/selftests/bpf/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index 246d09ffb296..30d0e7a813d2 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -127,7 +127,7 @@ $(OUTPUT)/test_stub.o: test_stub.c
 .PHONY: $(OUTPUT)/runqslower
 $(OUTPUT)/runqslower: force
 	$(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/runqslower	      \
-		    OUTPUT=$(CURDIR)/tools/
+		    OUTPUT=$(CURDIR)/tools/ VMLINUX_BTF=$(abspath ../../../../vmlinux)
 
 BPFOBJ := $(OUTPUT)/libbpf.a
 


  parent reply	other threads:[~2020-01-16 13:23 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-16 13:22 [PATCH bpf-next v3 00/11] tools: Use consistent libbpf include paths everywhere Toke Høiland-Jørgensen
2020-01-16 13:22 ` [PATCH bpf-next v3 01/11] samples/bpf: Don't try to remove user's homedir on clean Toke Høiland-Jørgensen
2020-01-16 13:22 ` [PATCH bpf-next v3 02/11] tools/bpf/runqslower: Fix override option for VMLINUX_BTF Toke Høiland-Jørgensen
2020-01-16 18:54   ` Andrii Nakryiko
2020-01-17  9:44     ` Toke Høiland-Jørgensen
2020-01-16 13:22 ` Toke Høiland-Jørgensen [this message]
2020-01-16 18:56   ` [PATCH bpf-next v3 03/11] selftests: Pass VMLINUX_BTF to runqslower Makefile Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 04/11] tools/runqslower: Use consistent include paths for libbpf Toke Høiland-Jørgensen
2020-01-16 21:56   ` Andrii Nakryiko
2020-01-17  9:46     ` Toke Høiland-Jørgensen
2020-01-16 13:22 ` [PATCH bpf-next v3 05/11] selftests: " Toke Høiland-Jørgensen
2020-01-16 21:57   ` Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 06/11] bpftool: " Toke Høiland-Jørgensen
2020-01-16 22:21   ` Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 07/11] perf: " Toke Høiland-Jørgensen
2020-01-16 22:22   ` Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 08/11] samples/bpf: " Toke Høiland-Jørgensen
2020-01-16 22:23   ` Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 09/11] selftests: Remove tools/lib/bpf from include path Toke Høiland-Jørgensen
2020-01-16 22:41   ` Andrii Nakryiko
2020-01-16 23:05     ` Andrii Nakryiko
2020-01-17  9:50       ` Toke Høiland-Jørgensen
2020-01-17  9:49     ` Toke Høiland-Jørgensen
2020-01-16 13:22 ` [PATCH bpf-next v3 10/11] tools/runqslower: " Toke Høiland-Jørgensen
2020-01-16 22:44   ` Andrii Nakryiko
2020-01-16 13:22 ` [PATCH bpf-next v3 11/11] libbpf: Fix include of bpf_helpers.h when libbpf is installed on system Toke Høiland-Jørgensen
2020-01-16 22:43   ` Andrii Nakryiko
2020-01-17  4:14 ` [PATCH bpf-next v3 00/11] tools: Use consistent libbpf include paths everywhere Alexei Starovoitov
2020-01-17  8:57   ` Jesper Dangaard Brouer
2020-01-17  9:58     ` Toke Høiland-Jørgensen

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=157918093501.1357254.2594464485570114583.stgit@toke.dk \
    --to=toke@redhat.com \
    --cc=acme@kernel.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=andriin@fb.com \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=brouer@redhat.com \
    --cc=clang-built-linux@googlegroups.com \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=dledford@redhat.com \
    --cc=jgg@ziepe.ca \
    --cc=john.fastabend@gmail.com \
    --cc=jolsa@redhat.com \
    --cc=kafai@fb.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=shuah@kernel.org \
    --cc=songliubraving@fb.com \
    --cc=yhs@fb.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).