From 66fa86c11eccb75fe9924beced2620760fca64b5 Mon Sep 17 00:00:00 2001 From: jsign Date: Sat, 12 Oct 2019 18:12:39 -0300 Subject: [PATCH] change tests to not use nacl/amd64p32 --- src/cmd/go/testdata/script/env_write.txt | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/cmd/go/testdata/script/env_write.txt b/src/cmd/go/testdata/script/env_write.txt index c30883ce147..f95f1f842a2 100644 --- a/src/cmd/go/testdata/script/env_write.txt +++ b/src/cmd/go/testdata/script/env_write.txt @@ -109,16 +109,8 @@ stderr 'unsupported GOOS/GOARCH.*/amd644$' # check -w doesn't allow invalid GOOS with valid GOARCH ! go env -w GOOS=linuxx GOARCH=amd64 stderr 'unsupported GOOS/GOARCH pair linuxx' -# check that -u won't allow an invalid combination after a successful -w -go env -w GOOS=nacl GOARCH=amd64p32 +# check that -u considers explicit envs +go env -w GOOS=linux GOARCH=mips +env GOOS=windows ! go env -u GOOS -stderr 'unsupported GOOS/GOARCH.*/amd64p32$' -# check that -u considers explicit envs in action validation -go env -u GOOS GOARCH -env GOOS=nacl -env GOARCH=amd64p32 -go env -w GOOS=linux GOARCH=amd64 -env GOOS= -! go env -u GOARCH -stderr 'linux/amd64p32' - +stderr 'unsupported GOOS/GOARCH.*windows/mips$'