Merge #34069 #34086

34069: *: bump github.com/knz/go-libedit r=jordanlewis,knz a=petermattis

This picks up a change which silences the pointer-sign conversion warnings which were in turn causing `TestLint/TestVet` to error spuriously.

Fixes #34059

Release note: None

34086: build: clear GOFLAGS when invoking `go install` r=tbg a=petermattis

Similar to the previous `GOFLAGS` fix, we need to make sure the
`GOFLAGS` env variable is cleared when invoking `go install` as we're
passing those flags on the command line as well. go1.11 added support
for parsing the `GOFLAGS` environment variable, but that support is not
identical to passing those flags on the command line (e.g. there is a
difference between `-o foo` and `-o=foo`).

Fixes #34083

Release note: None

Co-authored-by: Peter Mattis <[email protected]>

Makefile

@@ -177,7 +177,7 @@ $(info GOPATH set to $(GOPATH))
 
 # We install our vendored tools to a directory within this repository to avoid
 # overwriting any user-installed binaries of the same name in the default GOBIN.
-GO_INSTALL := GOBIN='$(abspath bin)' $(GO) install
+GO_INSTALL := GOBIN='$(abspath bin)' GOFLAGS= $(GO) install
 
 # Prefer tools we've installed with go install and Yarn to those elsewhere on
 # the PATH.
@@ -868,7 +868,7 @@ stress stressrace:
 roachprod-stress roachprod-stressrace: bin/roachprod-stress
 	# The bootstrap target creates, among other things, ./bin/stress.
 	build/builder.sh make bin/.bootstrap
-	build/builder.sh make test GOFLAGS="$(GOFLAGS) -v -c -o $(notdir $(PKG)).test" PKG=$(PKG)
+	build/builder.sh make test GOFLAGS="$(GOFLAGS) -v -c -o $(notdir $(patsubst %/,%,$(PKG))).test" PKG=$(PKG)
 	@if [ -z "$(CLUSTER)" ]; then \
 	  echo "ERROR: missing or empty CLUSTER"; \
 	else \

pkg/testutils/lint/lint_test.go

@@ -1024,7 +1024,6 @@ func TestLint(t *testing.T) {
 	})
 
 	t.Run("TestVet", func(t *testing.T) {
-		t.Skip("#34059")
 		t.Parallel()
 		// `go vet` is a special snowflake that emits all its output on
 		// `stderr.