summaryrefslogtreecommitdiffstats
path: root/webapp/Makefile
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-05-13 16:17:07 -0400
committerChristopher Speller <crspeller@gmail.com>2016-05-13 16:17:07 -0400
commit587ddde5876c14e2617cc341d8e5a13195cc0105 (patch)
tree4f1822636a131f62f18766a856024ebc40963c85 /webapp/Makefile
parent39b520e38e0b4812819397a6163b0de308cc6260 (diff)
downloadchat-587ddde5876c14e2617cc341d8e5a13195cc0105.tar.gz
chat-587ddde5876c14e2617cc341d8e5a13195cc0105.tar.bz2
chat-587ddde5876c14e2617cc341d8e5a13195cc0105.zip
Cleaning up make test-client. Adding to build. (#2984)
Diffstat (limited to 'webapp/Makefile')
-rw-r--r--webapp/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/webapp/Makefile b/webapp/Makefile
index b0c2c831a..48172273f 100644
--- a/webapp/Makefile
+++ b/webapp/Makefile
@@ -1,10 +1,15 @@
-.PHONY: build test run clean stop
+.PHONY: build test run clean stop check-style run-unit
-test: .npminstall
+BUILD_SERVER_DIR = ..
+
+check-style: .npminstall
@echo Checking for style guide compliance
npm run check
+test: .npminstall
+ cd $(BUILD_SERVER_DIR) && $(MAKE) internal-test-client
+
.npminstall: package.json
@echo Getting dependencies using npm
@@ -12,7 +17,7 @@ test: .npminstall
touch $@
-build: | .npminstall test
+build: .npminstall
@echo Building mattermost Webapp
npm run build