summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 3 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 0947b0240..2b4d65693 100644
--- a/Makefile
+++ b/Makefile
@@ -178,13 +178,6 @@ endif
.PHONY: test
test:
cd js && $(npm) run test
-ifeq (, $(shell which phpunit 2> /dev/null))
- @echo "No phpunit command available, downloading a copy from the web"
- mkdir -p $(build_tools_directory)
- curl -sSL https://phar.phpunit.de/phpunit.phar -o $(build_tools_directory)/phpunit.phar
- php $(build_tools_directory)/phpunit.phar -c phpunit.xml --coverage-clover build/php-unit.clover
- php $(build_tools_directory)/phpunit.phar -c phpunit.integration.xml --coverage-clover build/php-integration.clover
-else
- phpunit -c phpunit.xml --coverage-clover build/php-unit.clover
- phpunit -c phpunit.integration.xml --coverage-clover build/php-unit.clover
-endif
+ ./vendor/phpunit/phpunit/phpunit -c phpunit.xml --coverage-clover build/php-unit.clover
+ # \Test\TestCase is only allowed to access the db if TRAVIS environment variable is set
+ env TRAVIS=1 ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml --coverage-clover build/php-unit.clover