From 320cb6d9effeb4117ed390ebd12d2686c92abc2b Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sat, 11 Mar 2023 14:09:16 -0500 Subject: [PATCH] Revert "Disable unified build and static init optimization for tests" This reverts commit e20d77bb79cb06e0c903ad529e26fc3438fcc801. Signed-off-by: Davanum Srinivas --- hack/lib/golang.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index 3be296dda23..58a70d80462 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -773,26 +773,15 @@ kube::golang::build_binaries_for_platform() { kube::golang::build_some_binaries "${nonstatics[@]}" 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 local outfile testpkg outfile=$(kube::golang::outfile_for_binary "${test}" "${platform}") testpkg=$(dirname "${test}") mkdir -p "$(dirname "${outfile}")" - GOEXPERIMENT="${testgoexperiment}" go test -c \ + go test -c \ ${goflags:+"${goflags[@]}"} \ - -gcflags="${testgogcflags}" \ + -gcflags="${gogcflags}" \ -asmflags="${goasmflags}" \ -ldflags="${goldflags}" \ -tags="${gotags:-}" \