Skip to content

Commit

Permalink
Remove - in front of phpunit line to make sure tests are marked as fa…
Browse files Browse the repository at this point in the history
…il when they fail. consequence is that the next command will not be run in the first tests failed.
  • Loading branch information
ruflin committed Oct 17, 2015
1 parent ba9c55c commit 7cb7498
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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)"
# eval "$(docker-machine env elastica)"

0 comments on commit 7cb7498

Please sign in to comment.