Skip to content

Commit

Permalink
Remove Makefile workaround for jsonapi on Windows (#1795)
Browse files Browse the repository at this point in the history
RELEASE_NOTES=n/a

Signed-off-by: Patrick Harböck <patrick.harboeck@tngtech.com>
  • Loading branch information
Pharb authored Feb 14, 2021
1 parent e9216ed commit 104864b
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FIRST_GOPATH := $(firstword $(subst :, ,$(GOPATH)))
PKGS := $(shell go list ./... | grep -v /tests | grep -v /xcpb | grep -v /gpb)
PKGSWIN := $(shell go list ./... | grep -v /tests | grep -v /xcpb | grep -v /gpb | grep -v "jsonapi")
GOFILES_NOVENDOR := $(shell find . -name vendor -prune -o -type f -name '*.go' -not -name '*.pb.go' -print)
GOFILES_BUILD := $(shell find . -type f -name '*.go' -not -name '*_test.go')
PROTOFILES := $(shell find . -name vendor -prune -o -type f -name '*.proto' -print)
Expand Down Expand Up @@ -115,7 +114,7 @@ test: $(GOPASS_OUTPUT)

test-win: $(GOPASS_OUTPUT)
@echo ">> TEST, \"fast-mode-win\": race detector off"
@$(foreach pkg, $(PKGSWIN),\
@$(foreach pkg, $(PKGS),\
$(GO) test -test.short -run '(Test|Example)' $(pkg) || exit 1;)

test-integration: $(GOPASS_OUTPUT)
Expand Down

0 comments on commit 104864b

Please sign in to comment.