pkg/report: test ReportToGuiltyFile

Refactor the existing guilty path testing code to allow for simpler
extension.

Reuse the resulting code to invoke guilty_raw tests.

2 files changed, 106 insertions, 21 deletions

diff --git a/pkg/report/report_test.go b/pkg/report/report_test.go
index 7e1417041..cea8588b3 100644
--- a/pkg/report/report_test.go
+++ b/pkg/report/report_test.go
@@ -279,27 +279,8 @@ func TestGuiltyFile(t *testing.T) {
 }
 
 func testGuiltyFile(t *testing.T, reporter *Reporter, fn string) {
-	data, err := ioutil.ReadFile(fn)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for bytes.HasPrefix(data, []byte{'#'}) {
-		nl := bytes.Index(data, []byte{'\n'})
-		if nl == -1 {
-			t.Fatalf("unterminated comment in file")
-		}
-		data = data[nl+1:]
-	}
-	const prefix = "FILE: "
-	if !bytes.HasPrefix(data, []byte(prefix)) {
-		t.Fatalf("no %v prefix in file", prefix)
-	}
-	nlnl := bytes.Index(data[len(prefix):], []byte{'\n', '\n'})
-	if nlnl == -1 {
-		t.Fatalf("no \\n\\n in file")
-	}
-	file := string(data[len(prefix) : len(prefix)+nlnl])
-	report := data[len(prefix)+nlnl:]
+	vars, report := parseGuiltyTest(t, fn)
+	file := vars["FILE"]
 	rep := reporter.Parse(report)
 	if rep == nil {
 		t.Fatalf("did not find crash in the input")
@@ -323,6 +304,43 @@ func testGuiltyFile(t *testing.T, reporter *Reporter, fn string) {
 	}
 }
 
+func TestRawGuiltyFile(t *testing.T) {
+	forEachFile(t, "guilty_raw", testRawGuiltyFile)
+}
+
+func testRawGuiltyFile(t *testing.T, reporter *Reporter, fn string) {
+	vars, report := parseGuiltyTest(t, fn)
+	outFile := reporter.ReportToGuiltyFile(vars["TITLE"], report)
+	if outFile != vars["FILE"] {
+		t.Fatalf("expected %#v, got %#v", vars["FILE"], outFile)
+	}
+}
+
+func parseGuiltyTest(t *testing.T, fn string) (map[string]string, []byte) {
+	data, err := ioutil.ReadFile(fn)
+	if err != nil {
+		t.Fatal(err)
+	}
+	nlnl := bytes.Index(data, []byte{'\n', '\n'})
+	if nlnl == -1 {
+		t.Fatalf("no \\n\\n in file")
+	}
+	vars := map[string]string{}
+	s := bufio.NewScanner(bytes.NewReader(data[:nlnl]))
+	for s.Scan() {
+		ln := strings.TrimSpace(s.Text())
+		if ln == "" || ln[0] == '#' {
+			continue
+		}
+		colon := strings.IndexByte(ln, ':')
+		if colon == -1 {
+			t.Fatalf("no : in %s", ln)
+		}
+		vars[strings.TrimSpace(ln[:colon])] = strings.TrimSpace(ln[colon+1:])
+	}
+	return vars, data[nlnl+2:]
+}
+
 func forEachFile(t *testing.T, dir string, fn func(t *testing.T, reporter *Reporter, fn string)) {
 	for os := range ctors {
 		if os == targets.Windows {
diff --git a/pkg/report/testdata/linux/guilty_raw/0 b/pkg/report/testdata/linux/guilty_raw/0
new file mode 100644
index 000000000..796637141
--- /dev/null
+++ b/pkg/report/testdata/linux/guilty_raw/0
@@ -0,0 +1,67 @@
+TITLE: WARNING in kernfs_get (4)
+FILE: fs/kernfs/dir.c
+
+------------[ cut here ]------------
+WARNING: CPU: 1 PID: 5108 at fs/kernfs/dir.c:522 kernfs_get.part.0+0x69/0x80 fs/kernfs/dir.c:522
+Modules linked in:
+CPU: 0 PID: 5108 Comm: syz-executor.3 Not tainted 6.2.0-rc6-next-20230131-syzkaller-09515-g80bd9028feca #0
+Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/12/2023
+RIP: 0010:kernfs_get.part.0+0x69/0x80 fs/kernfs/dir.c:522
+Code: 31 ff 89 ee e8 e8 65 7a ff 85 ed 74 18 e8 8f 69 7a ff be 04 00 00 00 48 89 df e8 a2 74 c9 ff f0 ff 03 5b 5d c3 e8 77 69 7a ff <0f> 0b eb df 48 89 df e8 eb 6d c9 ff eb c6 66 0f 1f 84 00 00 00 00
+RSP: 0018:ffffc900040bef10 EFLAGS: 00010293
+RAX: 0000000000000000 RBX: ffff888077931000 RCX: 0000000000000000
+RDX: ffff888021c91d40 RSI: ffffffff820a4ca9 RDI: 0000000000000005
+RBP: 0000000000000000 R08: 0000000000000005 R09: 0000000000000000
+R10: 0000000000000000 R11: 0000000000000000 R12: ffff8880779310e8
+R13: ffff88802b4c6028 R14: ffff8880222f2b50 R15: 0000000000000000
+FS:  00005555572ee400(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000
+CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
+CR2: 00007f167a621718 CR3: 00000000730ad000 CR4: 00000000003506f0
+DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
+DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
+Call Trace:
+ <TASK>
+ kernfs_get fs/kernfs/dir.c:521 [inline]
+ kernfs_new_node fs/kernfs/dir.c:676 [inline]
+ kernfs_create_dir_ns+0xc4/0x230 fs/kernfs/dir.c:1029
+ sysfs_create_dir_ns+0x12b/0x290 fs/sysfs/dir.c:59
+ create_dir lib/kobject.c:63 [inline]
+ kobject_add_internal+0x2c9/0x9c0 lib/kobject.c:231
+ kobject_add_varg lib/kobject.c:366 [inline]
+ kobject_init_and_add+0x101/0x170 lib/kobject.c:449
+ rx_queue_add_kobject net/core/net-sysfs.c:1063 [inline]
+ net_rx_queue_update_kobjects+0x25f/0x510 net/core/net-sysfs.c:1114
+ register_queue_kobjects net/core/net-sysfs.c:1774 [inline]
+ netdev_register_kobject+0x279/0x400 net/core/net-sysfs.c:2019
+ register_netdevice+0xd77/0x1640 net/core/dev.c:10048
+ cfg80211_register_netdevice+0x157/0x330 net/wireless/core.c:1397
+ ieee80211_if_add+0x1096/0x1970 net/mac80211/iface.c:2198
+ ieee80211_register_hw+0x37db/0x40d0 net/mac80211/main.c:1403
+ mac80211_hwsim_new_radio+0x25c5/0x4920 drivers/net/wireless/mac80211_hwsim.c:4583
+ hwsim_new_radio_nl+0xa09/0x10f0 drivers/net/wireless/mac80211_hwsim.c:5176
+ genl_family_rcv_msg_doit.isra.0+0x1e6/0x2d0 net/netlink/genetlink.c:968
+ genl_family_rcv_msg net/netlink/genetlink.c:1048 [inline]
+ genl_rcv_msg+0x4ff/0x7e0 net/netlink/genetlink.c:1065
+ netlink_rcv_skb+0x165/0x440 net/netlink/af_netlink.c:2574
+ genl_rcv+0x28/0x40 net/netlink/genetlink.c:1076
+ netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline]
+ netlink_unicast+0x547/0x7f0 net/netlink/af_netlink.c:1365
+ netlink_sendmsg+0x925/0xe30 net/netlink/af_netlink.c:1942
+ sock_sendmsg_nosec net/socket.c:722 [inline]
+ sock_sendmsg+0xde/0x190 net/socket.c:745
+ __sys_sendto+0x23a/0x340 net/socket.c:2142
+ __do_sys_sendto net/socket.c:2154 [inline]
+ __se_sys_sendto net/socket.c:2150 [inline]
+ __x64_sys_sendto+0xe1/0x1b0 net/socket.c:2150
+ do_syscall_x64 arch/x86/entry/common.c:50 [inline]
+ do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80
+ entry_SYSCALL_64_after_hwframe+0x63/0xcd
+RIP: 0033:0x7f859403e0fc
+Code: fa fa ff ff 44 8b 4c 24 2c 4c 8b 44 24 20 89 c5 44 8b 54 24 28 48 8b 54 24 18 b8 2c 00 00 00 48 8b 74 24 10 8b 7c 24 08 0f 05 <48> 3d 00 f0 ff ff 77 34 89 ef 48 89 44 24 08 e8 20 fb ff ff 48 8b
+RSP: 002b:00007ffea124f050 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
+RAX: ffffffffffffffda RBX: 00007f8594cd4620 RCX: 00007f859403e0fc
+RDX: 0000000000000024 RSI: 00007f8594cd4670 RDI: 0000000000000003
+RBP: 0000000000000000 R08: 00007ffea124f0a4 R09: 000000000000000c
+R10: 0000000000000000 R11: 0000000000000293 R12: 0000000000000000
+R13: 00007f8594cd4670 R14: 0000000000000003 R15: 0000000000000000
+ </TASK>
\ No newline at end of file