From fd6e8c6836a2684eb65849ff349e3575970533f3 Mon Sep 17 00:00:00 2001
From: Tobias Schottdorf <tobias.schottdorf@gmail.com>
Date: Tue, 25 Feb 2020 11:37:40 +0100
Subject: [PATCH] Makefile: pass GOTESTFLAGS=-json to `make testlogic`

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
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b2bea5d85b29..0ae9314ec7aa 100644
--- 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