From 7cb7498c931ee39facac7d741e4979bf643e9190 Mon Sep 17 00:00:00 2001 From: Ruflin Date: Sat, 17 Oct 2015 16:27:01 -0700 Subject: [PATCH] Remove - in front of phpunit line to make sure tests are marked as fail when they fail. consequence is that the next command will not be run in the first tests failed. --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b00e91149c..648f97f1fc 100644 --- a/Makefile +++ b/Makefile @@ -45,17 +45,17 @@ dependencies: ${SOURCE} .PHONY: phpunit phpunit: - -phpunit -c test/ --coverage-clover build/coverage/unit-coverage.xml --group unit - -phpunit -c test/ --coverage-clover build/coverage/functional-coverage.xml --group functional - -phpunit -c test/ --coverage-clover build/coverage/shutdown-coverage.xml --group shutdown - + phpunit -c test/ --coverage-clover build/coverage/unit-coverage.xml --group unit + phpunit -c test/ --coverage-clover build/coverage/functional-coverage.xml --group functional + phpunit -c test/ --coverage-clover build/coverage/shutdown-coverage.xml --group shutdown + .PHONY: tests tests: # Rebuild image to copy changes files to the image make elastica-image make setup docker-compose run elastica make phpunit - + # Makes it easy to run a single test file. Example to run IndexTest.php: make test TEST="IndexTest.php" .PHONY: test test: @@ -73,7 +73,7 @@ lint: ${RUN_ENV} php-cs-fixer fix .PHONY: loc -loc: +loc: ${RUN_ENV} cloc --by-file --xml --exclude-dir=build -out=build/cloc.xml . .PHONY: phploc @@ -115,7 +115,7 @@ destroy-environment: remove-containers: -docker stop $(shell docker ps -a -q) -docker rm -v $(shell docker ps -a -q) - + # Starts a shell inside the elastica image .PHONY: shell shell: @@ -172,4 +172,4 @@ push-images: build-images # google-setup: # docker-machine create --driver google --google-project elastica-1024 --google-machine-type n1-standard-8 elastica -# eval "$(docker-machine env elastica)" \ No newline at end of file +# eval "$(docker-machine env elastica)"