fix tests

[github/wallabag/wallabag.git] / Makefile

diff --git a/Makefile b/Makefile
index 2a74971828c9883eb1948af9449e95d85070b548..b33352616488d2c8a2c3a13d674f73714184eaf1 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 TMP_FOLDER=/tmp
 RELEASE_FOLDER=wllbg-release
 
-ENV=prod
+ifndef ENV
+       ENV=prod
+endif
 
 help: ## Display this help menu
        @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -15,14 +17,17 @@ install: ## Install wallabag with the latest version
 update: ## Update the wallabag installation to the latest version
        @sh scripts/update.sh $(ENV)
 
-run: ## Run the wallabag server
-       php bin/console server:run --env=$(ENV)
+dev: ## Install the latest dev version
+       @sh scripts/dev.sh
+
+run: ## Run the wallabag built-in server
+       @php bin/console server:run --env=$(ENV)
 
 build: ## Run grunt
        @grunt
 
 test: ## Launch wallabag testsuite
-       @ant prepare && phpunit -v
+       @ant prepare && bin/simple-phpunit -v
 
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION
@@ -35,6 +40,6 @@ travis: ## Make some stuff for Travis-CI
 deploy: ## Deploy wallabag
        @bundle exec cap staging deploy
 
-.PHONY: help clean install update build test release travis deploy
+.PHONY: help clean install update build test release travis deploy run dev
 
 .DEFAULT_GOAL := install