From d2203c4cced2281e4c0a0a68f9e5ff0e95241364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 7 Nov 2021 22:24:20 +0000 Subject: [PATCH] testdata: make reverse.txt pass with Go 1.18 This makes "go test -short" pass on the current gotip. Updates #385. --- testdata/scripts/reverse.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testdata/scripts/reverse.txt b/testdata/scripts/reverse.txt index 0cf9dad..106bbcd 100644 --- a/testdata/scripts/reverse.txt +++ b/testdata/scripts/reverse.txt @@ -24,7 +24,9 @@ cp stderr build-error.stderr stdin build-error.stderr garble reverse ./build-error -cmp stdout build-error-reverse.stdout +# Go 1.18 changed the error format slightly. +[!go1.18] cmp stdout build-error-reverse.stdout-go1.17 +[go1.18] cmp stdout build-error-reverse.stdout-go1.18 [short] stop # no need to verify this with -short @@ -151,8 +153,13 @@ main.main(...) test/main/main.go:11 +0x?? main filename: test/main/main.go --- build-error-reverse.stdout -- +-- build-error-reverse.stdout-go1.17 -- # test/main/build-error test/main/build-error/error.go:18: cannot convert UnobfuscatedStruct{} (type UnobfuscatedStruct) to type struct { SomeField int } exit status 2 exit status 2 +-- build-error-reverse.stdout-go1.18 -- +# test/main/build-error +test/main/build-error/error.go:18: cannot convert UnobfuscatedStruct{} (value of type UnobfuscatedStruct) to struct{SomeField int} +exit status 2 +exit status 2