github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116500 from dims/revert-linx-arm-workaround

Browse Source 
Revert "Disable unified build and static init optimization for tests"
This commit is contained in:
Kubernetes Prow Robot 2023-03-11 13:04:40 -08:00 committed by GitHub
commit ead7d66ee1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hack/lib/golang.sh
View File

@ -773,26 +773,15 @@ kube::golang::build_binaries_for_platform() {
kube::golang::build_some_binaries "${nonstatics[@]}" kube::golang::build_some_binaries "${nonstatics[@]}"
fi fi
# Workaround for https://github.com/kubernetes/kubernetes/issues/115675
local testgogcflags="${gogcflags}"
local testgoexperiment="${GOEXPERIMENT:-}"
if [[ "$(go version)" == *"go1.20"* && "${platform}" == "linux/arm" ]]; then
# work around https://github.com/golang/go/issues/58339 until fixed in go1.20.x
testgogcflags="${testgogcflags} -d=inlstaticinit=0"
# work around https://github.com/golang/go/issues/58425
testgoexperiment="nounified,${testgoexperiment}"
kube::log::info "Building test binaries with GOEXPERIMENT=${testgoexperiment} GCFLAGS=${testgogcflags} ASMFLAGS=${goasmflags} LDFLAGS=${goldflags}"
fi
for test in "${tests[@]:+${tests[@]}}"; do for test in "${tests[@]:+${tests[@]}}"; do
local outfile testpkg local outfile testpkg
outfile=$(kube::golang::outfile_for_binary "${test}" "${platform}") outfile=$(kube::golang::outfile_for_binary "${test}" "${platform}")
testpkg=$(dirname "${test}") testpkg=$(dirname "${test}")
mkdir -p "$(dirname "${outfile}")" mkdir -p "$(dirname "${outfile}")"
GOEXPERIMENT="${testgoexperiment}" go test -c \ go test -c \
${goflags:+"${goflags[@]}"} \ ${goflags:+"${goflags[@]}"} \
-gcflags="${testgogcflags}" \ -gcflags="${gogcflags}" \
-asmflags="${goasmflags}" \ -asmflags="${goasmflags}" \
-ldflags="${goldflags}" \ -ldflags="${goldflags}" \
-tags="${gotags:-}" \ -tags="${gotags:-}" \