Skip to content

Commit

Permalink
Makefile: pass GOTESTFLAGS=-json to make testlogic
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tbg committed Feb 28, 2020
1 parent eae5a92 commit fd6e8c6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fd6e8c6

Please sign in to comment.