diff options
| author | Daniel Schaal <daniel@schaal.email> | 2017-06-06 18:20:20 +0200 |
|---|---|---|
| committer | Bernhard Posselt <BernhardPosselt@users.noreply.github.com> | 2017-06-06 18:20:20 +0200 |
| commit | b7f20c0f36dd6e0ed65ca93fcec44aa23f2fa203 (patch) | |
| tree | 8882a0a91cce88683279b9030f126c303da5e7bb /Makefile | |
| parent | f18aef805e60d3c8c00f4aff0a5c633052e72e34 (diff) | |
Fix travis build (#178)
* Use stable12 branch for travis
* Shorten db indices to max 27 characters to satisfy app:check-code
* Use precise container, downgrade to psql 9.4
* Create psql role
* Fix ContentController test
* Fix PageController and StatusService tests
* Use OCP\IDBConnection, OCP\IDb was removed
* Extend IntegrationTest from \Test\Testcase, use loginAsUser to login
* Require phpunit 5, nextcloud tests not compatible with phpunit 6
Change tests to use phpunit from vendor directory
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -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 |