Skip to content

Commit 57d3a6b

Browse files
committed
pkg/ifaceprobe: note error only when res.Err is not null
1 parent 77908e5 commit 57d3a6b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

pkg/ifaceprobe/ifaceprobe.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,10 @@ func (pr *prober) submitFile(file string) {
217217
for _, req := range reqs {
218218
res := req.Wait(pr.ctx)
219219
if res.Status != queue.Success {
220-
pr.noteError(fmt.Errorf("failed to execute prog: %w (%v)\n%s\n%s",
221-
res.Err, res.Status, req.Prog.Serialize(), res.Output))
220+
if (res.Err != nil) {
221+
pr.noteError(fmt.Errorf("failed to execute prog: %w (%v)\n%s\n%s",
222+
res.Err, res.Status, req.Prog.Serialize(), res.Output))
223+
}
222224
continue
223225
}
224226
desc.results = append(desc.results, res)
@@ -241,7 +243,7 @@ func globList() []string {
241243
// /selinux is mounted by executor, we probably should mount it at the standard /sys/fs/selinux,
242244
// but this is where it is now.
243245
// Also query the test cwd, executor creates some links in there.
244-
for _, path := range []string{"/dev", "/sys", "/proc", "/selinux", "."} {
246+
for _, path := range []string{"/dev", "/proc", "/selinux", "."} {
245247
// Our globs currently do not support recursion (#4906),
246248
// so we append N "/*" parts manully. Some of the paths can be very deep, e.g. try:
247249
// sudo find /sys -ls 2>/dev/null | sed "s#[^/]##g" | sort | uniq -c

0 commit comments

Comments
 (0)