Move phpunit files to test directory

This commit is contained in:
Julius Haertl
2017-01-31 10:12:41 +01:00
parent 11a138835e
commit f1a87394da
3 changed files with 9 additions and 9 deletions

View File

@@ -77,9 +77,9 @@ 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
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
else
phpunit -c phpunit.xml --coverage-clover build/php-unit.clover
phpunit -c phpunit.integration.xml --coverage-clover build/php-unit.clover
phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.clover
phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-unit.clover
endif

View File

@@ -1,7 +1,7 @@
<phpunit bootstrap="tests/bootstrap.php" colors="true">
<phpunit bootstrap="bootstrap.php" colors="true">
<testsuites>
<testsuite name="integration">
<directory>./tests/integration</directory>
<directory>./integration</directory>
</testsuite>
</testsuites>
<filter>
@@ -9,4 +9,4 @@
<directory suffix=".php">./lib</directory>
</whitelist>
</filter>
</phpunit>
</phpunit>

View File

@@ -1,7 +1,7 @@
<phpunit bootstrap="tests/bootstrap.php" colors="true">
<phpunit bootstrap="bootstrap.php" colors="true">
<testsuites>
<testsuite name="unit">
<directory>./tests/unit</directory>
<directory>./unit</directory>
</testsuite>
</testsuites>
<filter>