diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
| commit | 62901defaebb8f3524bdfcad86b2576cfd9fe587 (patch) | |
| tree | b0740451c56c68c5284834fd02bbce4d831acc17 /Makefile | |
| parent | ad9dfc9c42b6597515d9eb0a96e9f069372dffdd (diff) | |
| parent | f3fa435a1b35c2ada4cd9a81744a41904fe97909 (diff) | |
| download | chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.gz chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.bz2 chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.zip | |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -143,7 +143,7 @@ check-style: test: start-docker @echo Running tests - $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=240s ./api || exit 1 + $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=340s ./api || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=12s ./model || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./store || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1 |