From cdf1aa4dc338ddd37917942e7d6b992f4e079a00 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Sat, 6 Jun 2020 09:15:20 +0200
Subject: pkg/report: deduplicate code across netbsd and openbsd

---
 pkg/report/netbsd_test.go | 66 ++---------------------------------------------
 1 file changed, 2 insertions(+), 64 deletions(-)

(limited to 'pkg/report/netbsd_test.go')

diff --git a/pkg/report/netbsd_test.go b/pkg/report/netbsd_test.go
index 3fb93ceb9..24c144ac0 100644
--- a/pkg/report/netbsd_test.go
+++ b/pkg/report/netbsd_test.go
@@ -4,17 +4,11 @@
 package report
 
 import (
-	"fmt"
 	"testing"
-
-	"github.com/google/syzkaller/pkg/symbolizer"
 )
 
 func TestNetbsdSymbolizeLine(t *testing.T) {
-	tests := []struct {
-		line   string
-		result string
-	}{
+	tests := []symbolizeLineTest{
 		// Normal symbolization.
 		{
 			"closef(ffffffff,ffffffff) at netbsd:closef+0xaf\n",
@@ -41,61 +35,5 @@ func TestNetbsdSymbolizeLine(t *testing.T) {
 			"#10 closef+0xaf kern_descrip.c:1241\n",
 		},
 	}
-	symbols := map[string][]symbolizer.Symbol{
-		"closef": {
-			{Addr: 0x815088a0, Size: 0x12f},
-		},
-		"sleep_finish_all": {
-			{Addr: 0x81237520, Size: 0x173},
-		},
-	}
-	symb := func(bin string, pc uint64) ([]symbolizer.Frame, error) {
-		if bin != "netbsd.gdb" {
-			return nil, fmt.Errorf("unknown pc 0x%x", pc)
-		}
-
-		switch pc & 0xffffffff {
-		case 0x8150894f:
-			return []symbolizer.Frame{
-				{
-					Func: "closef",
-					File: "/netbsd/src/kern_descrip.c",
-					Line: 1241,
-				},
-			}, nil
-		case 0x81237542:
-			return []symbolizer.Frame{
-				{
-					Func:   "sleep_finish_timeout",
-					File:   "/netbsd/src/kern_synch.c",
-					Line:   336,
-					Inline: true,
-				},
-				{
-					Func: "sleep_finish_all",
-					File: "/netbsd/src/kern_synch.c",
-					Line: 157,
-				},
-			}, nil
-		default:
-			return nil, fmt.Errorf("unknown pc 0x%x", pc)
-		}
-	}
-	nbsd := netbsd{
-		config: &config{
-			kernelSrc:      "/netbsd/src2",
-			kernelBuildSrc: "/netbsd/src",
-			kernelObj:      "/netbsd/src/obj/sys/arch/amd64/compile/GENERIC",
-		},
-		kernelObject: "netbsd.gdb",
-		symbols:      symbols,
-	}
-	for i, test := range tests {
-		t.Run(fmt.Sprint(i), func(t *testing.T) {
-			result := nbsd.symbolizeLine(symb, []byte(test.line))
-			if test.result != string(result) {
-				t.Errorf("want %q\n\t     get %q", test.result, string(result))
-			}
-		})
-	}
+	testSymbolizeLine(t, ctorNetbsd, tests)
 }
-- 
cgit mrf-deployment