diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-01-13 13:53:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 13:53:37 -0500 |
| commit | 97558f6a6ec4c53fa69035fb430ead209d9c222d (patch) | |
| tree | 6fc57f5b75b15a025348c6e295cea6aedb9e69ae /Makefile | |
| parent | 07bad4d6d518a9012a20fec8309cd625f57c7a8c (diff) | |
| download | chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.gz chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.tar.bz2 chat-97558f6a6ec4c53fa69035fb430ead209d9c222d.zip | |
PLT-4938 Add app package and move logic over from api package (#4931)
* Add app package and move logic over from api package
* Change app package functions to return errors
* Move non-api tests into app package
* Fix merge
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -184,17 +184,19 @@ test-server: start-docker prepare-enterprise echo "mode: count" > cover.out $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=650s -covermode=count -coverprofile=capi.out ./api || exit 1 + $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=60s -covermode=count -coverprofile=capp.out ./app || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=60s -covermode=count -coverprofile=cmodel.out ./model || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=180s -covermode=count -coverprofile=cstore.out ./store || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s -covermode=count -coverprofile=cutils.out ./utils || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s -covermode=count -coverprofile=cweb.out ./web || exit 1 tail -n +2 capi.out >> cover.out + tail -n +2 capp.out >> cover.out tail -n +2 cmodel.out >> cover.out tail -n +2 cstore.out >> cover.out tail -n +2 cutils.out >> cover.out tail -n +2 cweb.out >> cover.out - rm -f capi.out cmodel.out cstore.out cutils.out cweb.out + rm -f capi.out capp.out cmodel.out cstore.out cutils.out cweb.out ifeq ($(BUILD_ENTERPRISE_READY),true) @echo Running Enterprise tests |