From acc528cbf40c42eb112d2ce66c5f778bd4a397fb Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Tue, 16 Apr 2024 16:35:18 +0200
Subject: tools/syz-linter: check t.Logf/Errorf/Fatalf messages

Fix checking of Logf, it has string in 0-th arg.
Add checking of t.Errorf/Fatalf.
---
 pkg/report/decompile_test.go |  2 +-
 pkg/report/linux_test.go     | 10 +++++-----
 pkg/report/report_test.go    | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'pkg/report')

diff --git a/pkg/report/decompile_test.go b/pkg/report/decompile_test.go
index c89b88681..7e05561af 100644
--- a/pkg/report/decompile_test.go
+++ b/pkg/report/decompile_test.go
@@ -52,6 +52,6 @@ Disassembly of section .data:
 		},
 	}
 	if !reflect.DeepEqual(opcodes, expected) {
-		t.Errorf("Expected: %#v, got: %#v", expected, opcodes)
+		t.Errorf("expected: %#v, got: %#v", expected, opcodes)
 	}
 }
diff --git a/pkg/report/linux_test.go b/pkg/report/linux_test.go
index 5f27b9e7d..258efb271 100644
--- a/pkg/report/linux_test.go
+++ b/pkg/report/linux_test.go
@@ -248,7 +248,7 @@ func prepareLinuxReporter(t *testing.T, arch string) (*Reporter, *linux) {
 	}
 	reporter, err := NewReporter(cfg)
 	if err != nil {
-		t.Errorf("Failed to create a reporter instance for %#v: %v", arch, err)
+		t.Errorf("failed to create a reporter instance for %#v: %v", arch, err)
 	}
 	return reporter, reporter.impl.(*linux)
 }
@@ -369,11 +369,11 @@ func TestParseLinuxOpcodes(t *testing.T) {
 			_, linuxReporter := prepareLinuxReporter(t, test.arch)
 			ret, err := linuxReporter.parseOpcodes(test.input)
 			if test.output == nil && err == nil {
-				t.Errorf("Expected an error on input %#v", test)
+				t.Errorf("expected an error on input %#v", test)
 			} else if test.output != nil && err != nil {
-				t.Errorf("Unexpected error %v on input %#v", err, test.input)
+				t.Errorf("unexpected error %v on input %#v", err, test.input)
 			} else if test.output != nil && !reflect.DeepEqual(ret, *test.output) {
-				t.Errorf("Expected: %#v, got: %#v", test.output, ret)
+				t.Errorf("expected: %#v, got: %#v", test.output, ret)
 			}
 		})
 	}
@@ -441,6 +441,6 @@ func testDisassembly(t *testing.T, reporter *Reporter, linuxReporter *linux, tes
 	}
 
 	if !bytes.Equal(output, result) {
-		t.Fatalf("Expected:\n%s\nGot:\n%s\n", output, result)
+		t.Fatalf("expected:\n%s\ngot:\n%s", output, result)
 	}
 }
diff --git a/pkg/report/report_test.go b/pkg/report/report_test.go
index 934d4552e..9671607ec 100644
--- a/pkg/report/report_test.go
+++ b/pkg/report/report_test.go
@@ -148,10 +148,10 @@ func testParseImpl(t *testing.T, reporter *Reporter, test *ParseTest) {
 	containsCrash := reporter.ContainsCrash(test.Log)
 	expectCrash := (test.Title != "")
 	if expectCrash && !containsCrash {
-		t.Fatalf("ContainsCrash did not find crash")
+		t.Fatalf("did not find crash")
 	}
 	if !expectCrash && containsCrash {
-		t.Fatalf("ContainsCrash found unexpected crash")
+		t.Fatalf("found unexpected crash")
 	}
 	if rep != nil && rep.Title == "" {
 		t.Fatalf("found crash, but title is empty")
@@ -185,7 +185,7 @@ func testParseImpl(t *testing.T, reporter *Reporter, test *ParseTest) {
 			wantAltTitles += "ALT: " + t + "\n"
 		}
 		t.Fatalf("want:\nTITLE: %s\n%sTYPE: %v\nFRAME: %v\nCORRUPTED: %v\nSUPPRESSED: %v\n"+
-			"got:\nTITLE: %s\n%sTYPE: %v\nFRAME: %v\nCORRUPTED: %v (%v)\nSUPPRESSED: %v\n",
+			"got:\nTITLE: %s\n%sTYPE: %v\nFRAME: %v\nCORRUPTED: %v (%v)\nSUPPRESSED: %v",
 			test.Title, wantAltTitles, test.Type, test.Frame, test.Corrupted, test.Suppressed,
 			title, gotAltTitles, typ, frame, corrupted, corruptedReason, suppressed)
 	}
@@ -206,13 +206,13 @@ func checkReport(t *testing.T, reporter *Reporter, rep *Report, test *ParseTest)
 		t.Fatalf("bad Output:\n%s", rep.Output)
 	}
 	if rep.StartPos != 0 && rep.EndPos != 0 && rep.StartPos >= rep.EndPos {
-		t.Fatalf("StartPos=%v >= EndPos=%v", rep.StartPos, rep.EndPos)
+		t.Fatalf("StartPos %v >= EndPos %v", rep.StartPos, rep.EndPos)
 	}
 	if rep.EndPos > len(rep.Output) {
-		t.Fatalf("EndPos=%v > len(Output)=%v", rep.EndPos, len(rep.Output))
+		t.Fatalf("EndPos %v > len(Output) %v", rep.EndPos, len(rep.Output))
 	}
 	if rep.SkipPos <= rep.StartPos || rep.SkipPos > rep.EndPos {
-		t.Fatalf("bad SkipPos=%v: StartPos=%v EndPos=%v", rep.SkipPos, rep.StartPos, rep.EndPos)
+		t.Fatalf("bad SkipPos %v: StartPos %v EndPos %v", rep.SkipPos, rep.StartPos, rep.EndPos)
 	}
 	if test.StartLine != "" {
 		if test.EndLine == "" {
-- 
cgit mrf-deployment