Merge #45383

45383: Makefile: pass GOTESTFLAGS=-json to `make testlogic` r=otan a=tbg testlogic has some arcane magic, which of course broke things: it wasn't picking up the GOTESTFLAGS variable, which ultimately means that TC was expecting JSON output but wasn't getting it. This commit fixes it. Release note: None Co-authored-by: Tobias Schottdorf <[email protected]>
cockroachdb · Feb 28, 2020 · cc6d152 · cc6d152
2 parents 8c01571 + fd6e8c6
commit cc6d152
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -1670,7 +1670,7 @@ $(testbins): bin/%: bin/%.d | bin/prereqs $(SUBMODULES_TARGET)
 	@echo go test -c $($*-package)
 	bin/prereqs -bin-name=$* -test $($*-package) > $@.d.tmp
 	mv -f $@.d.tmp $@.d
-	$(xgo) test $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LINKFLAGS)' -c -o $@ $($*-package)
+	$(xgo) test $(GOTESTFLAGS) $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LINKFLAGS)' -c -o $@ $($*-package)
 
 bin/prereqs: ./pkg/cmd/prereqs/*.go | bin/.submodules-initialized
 	@echo go install -v ./pkg/cmd/prereqs