Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upload coverage data #3

Merged
merged 1 commit into from
Jan 31, 2017
Merged

Upload coverage data #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
sudo: false
language: php
services:
- mysql
Expand All @@ -9,9 +8,6 @@ env:
- CORE_BRANCH=master DB=sqlite
- CORE_BRANCH=stable11 DB=sqlite

matrix:
fast_finish: true

before_install:
# install core
- cd ../
Expand All @@ -35,4 +31,4 @@ after_failure:
- cat ../../data/nextcloud.log

after_success:
- bash <(curl -s https://codecov.io/bash)
- bash <(curl -s https://codecov.io/bash)
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,15 @@ appstore: clean-build build


test:
mkdir -p build/
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 tests/phpunit.xml --coverage-clover build/php-unit.clover
php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.clover
php $(build_tools_directory)/phpunit.phar -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
else
phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.clover
phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-unit.clover
phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
endif
2 changes: 1 addition & 1 deletion tests/phpunit.integration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">./lib</directory>
<directory suffix=".php">./../lib</directory>
</whitelist>
</filter>
</phpunit>
2 changes: 1 addition & 1 deletion tests/phpunit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">./lib</directory>
<directory suffix=".php">./../lib</directory>
</whitelist>
</filter>
</phpunit>