ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Move phpunit files to test directory

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -77,9 +77,9 @@ ifeq (, $(shell which phpunit 2> /dev/null))
@echo "No phpunit command available, downloading a copy from the web" @echo "No phpunit command available, downloading a copy from the web"
mkdir -p $(build_tools_directory) mkdir -p $(build_tools_directory)
curl -sSL https://phar.phpunit.de/phpunit.phar -o $(build_tools_directory)/phpunit.phar 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 tests/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.integration.xml --coverage-clover build/php-integration.clover
else else
phpunit -c phpunit.xml --coverage-clover build/php-unit.clover phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.clover
phpunit -c phpunit.integration.xml --coverage-clover build/php-unit.clover phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-unit.clover
endif endif

6
phpunit.integration.xml → tests/phpunit.integration.xml
View File

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

4
phpunit.xml → tests/phpunit.xml
View File

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