elf: skip BenchmarkWriteELF if ELF file wasn't built #17536
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tklauser
added
the
release-note/misc
jibi
approved these changes
Oct 5, 2021
tklauser
force-pushed
the
elf-bench-skip-elf-not-found
branch
from
f4c26f2
to
d8f5ac4
Compare
tklauser
force-pushed
the
elf-bench-skip-elf-not-found
branch
from
d8f5ac4
to
6073db5
Compare
When running `go test -run=^$ -bench=. ./...` on the Cilium source,
BenchmarkWriteELF currently fails with:
--- FAIL: BenchmarkWriteELF
elf_test.go:201: failed to open ELF file ../../test/bpf/elf-demo.o: open ../../test/bpf/elf-demo.o: no such file or directory
That particular file is only built when running tests/benchmarks using
the Makefile-based flow. In order to still allow Cilium's benchmarks
suite to run without errors when invoked using native `go test -bench`,
just skip BenchmarkWriteELF if the ELF file doesn't exist.
In the future we might want to embed that ELF file into the
test/benchmark itself using bpf2go [1].
[1] https://pkg.go.dev/github.com/cilium/ebpf/cmd/bpf2go
For cilium#17535
Reported-by: Emmanuel T Odeke <emmanuel@orijtech.com>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
tklauser
force-pushed
the
elf-bench-skip-elf-not-found
branch
from
6073db5
to
6ef84f6
Compare
|
Reviews are in. Travis CI and GH actions passed, no need to run full CI. Marking as ready to merge. |
tklauser
added
the
ready-to-merge
gandro
added a commit
to gandro/cilium
that referenced
this pull request
Nov 29, 2021
This will skip the test when running the tests standalone (i.e. via `go test` and not via Makefile). See cilium#17536 for more details about this particular file, which applied the same principle to the benchmark in that test suite. See also cilium#16914 Reported-by: Hemanth Malla <hemanth.malla@datadoghq.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
qmonnet
pushed a commit
that referenced
this pull request
Nov 30, 2021
This will skip the test when running the tests standalone (i.e. via `go test` and not via Makefile). See #17536 for more details about this particular file, which applied the same principle to the benchmark in that test suite. See also #16914 Reported-by: Hemanth Malla <hemanth.malla@datadoghq.com> Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When running
go test -run=^$ -bench=. ./...on the Cilium source,BenchmarkWriteELF currently fails with:
That particular file is only built when running tests/benchmarks using
the Makefile-based flow. In order to still allow Cilium's benchmarks
suite to run without errors when invoked using native
go test -bench,just skip BenchmarkWriteELF if the ELF file doesn't exist.
In the future we might want to embed that ELF file into the
test/benchmark itself using bpf2go [1].
[1] https://pkg.go.dev/github.com/cilium/ebpf/cmd/bpf2go
For #17535