github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

No need to pass GOFLAGS to $goflags variables.

Browse Source 
In go 1.11, go commands will use `GOFLAGS` as default flags, see
https://golang.org/doc/go1.11#go_command.

There is no need to pass GOFLAGS to $goflags, and if we do, go commands
will fail with "duplicate flags" error, e.g.

```
$ make test-integration WHAT=./test/integration/scheduler GOFLAGS="-v"
...
go test: v flag may be set only once
run "go help test" or "go help testflag" for more information
...
```
This commit is contained in:
Yecheng Fu 2018-11-19 15:23:54 +08:00
parent 7ba79c3183
commit ce22322ef1
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/lib/golang.sh
View File

@ -677,9 +677,7 @@ kube::golang::build_binaries() {
local host_platform local host_platform
host_platform=$(kube::golang::host_platform) host_platform=$(kube::golang::host_platform)
# Use eval to preserve embedded quoted strings.
local goflags goldflags goasmflags gogcflags local goflags goldflags goasmflags gogcflags
eval "goflags=(${GOFLAGS:-})"
goldflags="${GOLDFLAGS:-} -s -w $(kube::version::ldflags)" goldflags="${GOLDFLAGS:-} -s -w $(kube::version::ldflags)"
goasmflags="-trimpath=${KUBE_ROOT}" goasmflags="-trimpath=${KUBE_ROOT}"
gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}" gogcflags="${GOGCFLAGS:-} -trimpath=${KUBE_ROOT}"

1
hack/make-rules/test.sh
View File

@ -171,7 +171,6 @@ done
shift $((OPTIND - 1)) shift $((OPTIND - 1))
# Use eval to preserve embedded quoted strings. # Use eval to preserve embedded quoted strings.
eval "goflags=(${GOFLAGS:-})"
eval "testargs=(${KUBE_TEST_ARGS:-})" eval "testargs=(${KUBE_TEST_ARGS:-})"
# Used to filter verbose test output. # Used to filter verbose test output.

3
hack/make-rules/vet.sh
View File

@ -35,9 +35,6 @@ fi
# See https://github.com/golang/go/issues/16086 for details. # See https://github.com/golang/go/issues/16086 for details.
go install ./cmd/... go install ./cmd/...
# Use eval to preserve embedded quoted strings.
eval "goflags=(${GOFLAGS:-})"
# Filter out arguments that start with "-" and move them to goflags. # Filter out arguments that start with "-" and move them to goflags.
targets=() targets=()
for arg; do for arg; do