From fad4a16fd43f6a72b6917eff656be27522809074 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Fri, 15 Oct 2021 11:22:03 -0400 Subject: [PATCH] cmd/go: use portable flags in TestScript/version_build_settings This fixes a test failure on the 386-longtest builder. For #37475 Change-Id: Icd1d3474968fcf85ef893190760fb488302abc3a Reviewed-on: https://go-review.googlesource.com/c/go/+/356209 Trust: Bryan C. Mills Run-TryBot: Bryan C. Mills TryBot-Result: Go Bot Reviewed-by: Jay Conrod --- .../go/testdata/script/version_build_settings.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cmd/go/testdata/script/version_build_settings.txt b/src/cmd/go/testdata/script/version_build_settings.txt index 7e93643b9f..1ced285ac3 100644 --- a/src/cmd/go/testdata/script/version_build_settings.txt +++ b/src/cmd/go/testdata/script/version_build_settings.txt @@ -8,17 +8,17 @@ stdout '^\tbuild\tcompiler\tgc$' # Toolchain flags are added if present. # The raw flags are included, with package patterns if specified. -go build -asmflags=all=-spectre=all +go build -asmflags=example.com/m=-D=FOO=bar go version -m m$GOEXE -stdout '^\tbuild\tasmflags\tall=-spectre=all$' +stdout '^\tbuild\tasmflags\texample\.com/m=-D=FOO=bar$' -go build -gcflags=all=-spectre=all +go build -gcflags=example.com/m=-N go version -m m$GOEXE -stdout '^\tbuild\tgcflags\tall=-spectre=all$' +stdout '^\tbuild\tgcflags\texample\.com/m=-N$' -go build -ldflags=-w +go build -ldflags=example.com/m=-w go version -m m$GOEXE -stdout '^\tbuild\tldflags\t-w$' +stdout '^\tbuild\tldflags\texample\.com/m=-w$' # gccgoflags are not added when gc is used, and vice versa. # TODO: test gccgo. -- 2.50.0