misc/cgo/errors: use expected column numbers

The test was using the wrong column numbers, and was erroneously
passing because there happened to be line numbers that matched those
column numbers. Change the test harness to require the expected line
number for the ERROR HERE regexp case, so that this doesn't happen again.

Also rename a couple of variables in the test to avoid useless
redeclaration errors.

Fixes #46534

Change-Id: I2fcbf5e379c346de5346035c73d174a3980c0927
Reviewed-on: https://go-review.googlesource.com/c/go/+/324970
Trust: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>

diff --git a/misc/cgo/errors/errors_test.go b/misc/cgo/errors/errors_test.go
index a077b5947862134295016c79b59ee1a5e55087bd..68a30a44fe427d434df9dc634f702fc38552aa5e 100644 (file)
--- a/misc/cgo/errors/errors_test.go
+++ b/misc/cgo/errors/errors_test.go
@@ -40,7 +40,8 @@ func check(t *testing.T, file string) {
                        if len(frags) == 1 {
                                continue
                        }
-                       re, err := regexp.Compile(string(frags[1]))
+                       frag := fmt.Sprintf(":%d:.*%s", i+1, frags[1])
+                       re, err := regexp.Compile(frag)
                        if err != nil {
                                t.Errorf("Invalid regexp after `ERROR HERE: `: %#q", frags[1])
                                continue

diff --git a/misc/cgo/errors/testdata/err2.go b/misc/cgo/errors/testdata/err2.go
index 1d22401aee53a6e0783b3dc16d7a1555d67d4180..a90598fe35b6304434bba7253c29b1d62173dcc4 100644 (file)
--- a/misc/cgo/errors/testdata/err2.go
+++ b/misc/cgo/errors/testdata/err2.go
@@ -40,15 +40,15 @@ func main() {
        C.foop = x // ERROR HERE
 
        // issue 13129: used to output error about C.unsignedshort with CC=clang
-       var x C.ushort
-       x = int(0) // ERROR HERE: C\.ushort
+       var x1 C.ushort
+       x1 = int(0) // ERROR HERE: C\.ushort
 
        // issue 13423
        _ = C.fopen() // ERROR HERE
 
        // issue 13467
-       var x rune = '✈'
-       var _ rune = C.transform(x) // ERROR HERE: C\.int
+       var x2 rune = '✈'
+       var _ rune = C.transform(x2) // ERROR HERE: C\.int
 
        // issue 13635: used to output error about C.unsignedchar.
        // This test tests all such types.
@@ -91,10 +91,10 @@ func main() {
 
        // issue 26745
        _ = func(i int) int {
-               return C.i + 1 // ERROR HERE: :13
+               return C.i + 1 // ERROR HERE: 14
        }
        _ = func(i int) {
-               C.fi(i) // ERROR HERE: :6
+               C.fi(i) // ERROR HERE: 7
        }
 
        C.fi = C.fi // ERROR HERE