From d46bc75207fea1d7671c1277dd660cf1a4d7847b Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 26 Oct 2020 11:13:01 +0100 Subject: pkg/report: ignore "ddb.onpanic" on netbsd --- pkg/report/netbsd.go | 4 +++- pkg/report/report.go | 1 + pkg/report/testdata/netbsd/report/14 | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkg/report/testdata/netbsd/report/14 diff --git a/pkg/report/netbsd.go b/pkg/report/netbsd.go index 9eea6c2b2..fea878622 100644 --- a/pkg/report/netbsd.go +++ b/pkg/report/netbsd.go @@ -61,7 +61,9 @@ var netbsdOopses = append([]*oops{ fmt: "UBSan: Undefined Behavior in %[1]v", }, }, - []*regexp.Regexp{}, + []*regexp.Regexp{ + compile(`ddb\.onpanic:`), + }, }, { []byte("UBSan:"), diff --git a/pkg/report/report.go b/pkg/report/report.go index d79540fb9..ae618d6e6 100644 --- a/pkg/report/report.go +++ b/pkg/report/report.go @@ -647,6 +647,7 @@ var commonOopses = []*oops{ compile("_panic:"), // Android prints this sometimes during boot. compile("xlog_status:"), + compile(`ddb\.onpanic:`), }, }, } diff --git a/pkg/report/testdata/netbsd/report/14 b/pkg/report/testdata/netbsd/report/14 new file mode 100644 index 000000000..e7640a135 --- /dev/null +++ b/pkg/report/testdata/netbsd/report/14 @@ -0,0 +1,14 @@ + +/dev/rdk0: MARKING FILE SYSTEM CLEAN +swapctl: setting dump device to /dev/dk1 +swapctl: adding /dev/dk1 as swap device at priority 0 +Starting file system checks: +Loaded entropy from /var/db/entropy-file. +Setting tty flags. +Setting sysctl variables: +ddb.onpanic: 1 -> 1 +ddb.commandonenter: trace;show registers -> "show registers;bt;show panic;ps;show all locks;show all pages;show all pools" +ddb.lines: 24 -> 0 +ddb.maxwidth: 80 -> 0 +Starting network. +IPv6 mode: host -- cgit mrf-deployment