From: Bryan C. Mills <bcmills@google.com>
Date: Thu, 7 Oct 2021 18:23:54 +0000 (-0400)
Subject: test/fixedbugs: fix issue48784.go to pass with -G=0
X-Git-Tag: go1.18beta1~988
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7286502b0d225b995d391c72efbaa7690ad023a9;p=gostls13.git

test/fixedbugs: fix issue48784.go to pass with -G=0

This test is currently failing in the longtest builders.

I do not know how or why the builders are adding the -G=0 parameter.

Updates #48784

Change-Id: I62248d3fbc47567a8c73b4868a2d4aeb0bc47bc3
Reviewed-on: https://go-review.googlesource.com/c/go/+/354631
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Robert Griesemer <gri@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
---

diff --git a/test/fixedbugs/issue48784.go b/test/fixedbugs/issue48784.go
index 6048518df2..b07f524305 100644
--- a/test/fixedbugs/issue48784.go
+++ b/test/fixedbugs/issue48784.go
@@ -15,9 +15,9 @@ var t T
 var a [1]int
 
 var (
-	_ = s == nil // ERROR "invalid operation:.*mismatched types string and untyped nil"
-	_ = b == nil // ERROR "invalid operation:.*mismatched types bool and untyped nil"
-	_ = i == nil // ERROR "invalid operation:.*mismatched types int and untyped nil"
-	_ = t == nil // ERROR "invalid operation:.*mismatched types T and untyped nil"
-	_ = a == nil // ERROR "invalid operation:.*mismatched types \[1\]int and untyped nil"
+	_ = s == nil // ERROR "invalid operation:.*mismatched types string and (untyped )?nil"
+	_ = b == nil // ERROR "invalid operation:.*mismatched types bool and (untyped )?nil"
+	_ = i == nil // ERROR "invalid operation:.*mismatched types int and (untyped )?nil"
+	_ = t == nil // ERROR "invalid operation:.*mismatched types T and (untyped )?nil"
+	_ = a == nil // ERROR "invalid operation:.*mismatched types \[1\]int and (untyped )?nil"
 )