go/analysis: fix two tests in preparation for go vet CL 703400

CL 703400 will cause go vet no longer to report an error when
the command produces diagnostics.

For golang/go#75432

Change-Id: Ica369349112c1c46f19c52e2c9b886ac8cf7ab5b
Reviewed-on: https://go-review.googlesource.com/c/tools/+/703976
Reviewed-by: Michael Matloob <matloob@golang.org>
Reviewed-by: Michael Matloob <matloob@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Alan Donovan <adonovan@google.com>

Author: adonovan

go/analysis/internal/versiontest/version_test.go

@@ -103,7 +103,12 @@ func TestVettool(t *testing.T) {
 	cmd.Dir = testDir(t)
 	cmd.Env = append(os.Environ(), "VERSIONTEST_MULTICHECKER=1")
 	out, err := cmd.CombinedOutput()
-	if err == nil || !strings.Contains(string(out), "x.go:1:1: goversion=go1.20\n") {
+	if err != nil {
+		// Before go1.25, vet exited nonzero after printing diagnostics.
+		// TODO(adonovan): when go1.25 is assured, assert err == nil.
+		t.Logf("go vet: %v", err)
+	}
+	if !strings.Contains(string(out), "x.go:1:1: goversion=go1.20\n") {
 		t.Fatalf("vettool: %v\n%s", err, out)
 	}
 }

go/analysis/unitchecker/unitchecker_test.go

@@ -179,23 +179,31 @@ func _() {
 
 	t.Run("a", func(t *testing.T) {
 		code, _, stderr := vet(t, "golang.org/fake/a")
-		exitcode(t, code, 1)
+		if false {
+			exitcode(t, code, 1) // changing to 0 in go1.25; TODO(adonovan): re-enable
+		}
 		substring(t, "stderr", stderr, "a/a.go:4:11: call of MyFunc123")
 	})
 	t.Run("b", func(t *testing.T) {
 		code, _, stderr := vet(t, "golang.org/fake/b")
-		exitcode(t, code, 1)
+		if false {
+			exitcode(t, code, 1) // changing to 0 in go1.25; TODO(adonovan): re-enable
+		}
 		substring(t, "stderr", stderr, "b/b.go:6:13: call of MyFunc123")
 		substring(t, "stderr", stderr, "b/b.go:7:11: call of MyFunc123")
 	})
 	t.Run("c", func(t *testing.T) {
 		code, _, stderr := vet(t, "golang.org/fake/c")
-		exitcode(t, code, 1)
+		if false {
+			exitcode(t, code, 1) // changing to 0 in go1.25; TODO(adonovan): re-enable
+		}
 		substring(t, "stderr", stderr, "c/c.go:5:5: self-assignment of i")
 	})
 	t.Run("ab", func(t *testing.T) {
 		code, _, stderr := vet(t, "golang.org/fake/a", "golang.org/fake/b")
-		exitcode(t, code, 1)
+		if false {
+			exitcode(t, code, 1) // changing to 0 in go1.25; TODO(adonovan): re-enable
+		}
 		substring(t, "stderr", stderr, "a/a.go:4:11: call of MyFunc123")
 		substring(t, "stderr", stderr, "b/b.go:6:13: call of MyFunc123")
 		substring(t, "stderr", stderr, "b/b.go:7:11: call of MyFunc123")
@@ -216,7 +224,9 @@ func _() {
 	})
 	t.Run("a-context", func(t *testing.T) {
 		code, _, stderr := vet(t, "-c=0", "golang.org/fake/a")
-		exitcode(t, code, 1)
+		if false {
+			exitcode(t, code, 1) // changing to 0 in go1.25; TODO(adonovan): re-enable
+		}
 		substring(t, "stderr", stderr, "a/a.go:4:11: call of MyFunc123")
 		substring(t, "stderr", stderr, "4		MyFunc123")
 	})