Split framework tests from assets and versioned to prevent time limits being exceeded

Also removed an unneeded editorconfig block which is duplicated and adds PHP 7.2 and 7.3 into the builds
This commit is contained in:
Robbie Averill 2019-02-02 11:22:56 +03:00
parent 824bd2cf91
commit c8451b9071
3 changed files with 27 additions and 29 deletions

View File

@ -15,10 +15,6 @@ trim_trailing_whitespace = true
[*.md] [*.md]
trim_trailing_whitespace = false trim_trailing_whitespace = false
[*.yml]
indent_size = 2
indent_style = space
[*.{yml,json}] [*.{yml,json}]
# The indent size used in the `package.json` file cannot be changed # The indent size used in the `package.json` file cannot be changed
# https://github.com/npm/npm/pull/3180#issuecomment-16336516 # https://github.com/npm/npm/pull/3180#issuecomment-16336516

View File

@ -33,16 +33,20 @@ matrix:
- PHPUNIT_TEST=core - PHPUNIT_TEST=core
- DB=MYSQL - DB=MYSQL
- PDO=1 - PDO=1
- php: 7.1.2 - php: 7.1
env:
- PHPUNIT_TEST=framework
- DB=MYSQL
- php: 7.3
env: env:
- PHPUNIT_TEST=core - PHPUNIT_TEST=core
- DB=PGSQL - DB=PGSQL
# admin php tests # admin php tests
- php: 5.6 - php: 7.0
env: env:
- PHPUNIT_TEST=admin - PHPUNIT_TEST=admin
- DB=PGSQL - DB=PGSQL
- php: 7.1.2 - php: 7.2
env: env:
- PHPUNIT_TEST=admin - PHPUNIT_TEST=admin
- DB=MYSQL - DB=MYSQL

View File

@ -4,11 +4,12 @@
Requires PHPUnit 5+ Requires PHPUnit 5+
Usage: Usage:
- "phpunit": Runs all tests in all folders - "vendor/bin/phpunit": Runs all tests in all folders
- "phpunit framework/tests/": Run all tests of the framework module - "vendor/bin/phpunit vendor/silverstripe/framework/tests/": Run all tests of the framework module
- "phpunit framework/tests/filesystem": Run all filesystem tests within the framework module - "vendor/bin/phpunit vendor/silverstripe/framework/tests/filesystem": Run all filesystem tests within framework
- "phpunit framework/tests/filesystem/FolderTest.php": Run a single test - "vendor/bin/phpunit vendor/silverstripe/framework/tests/filesystem/FolderTest.php": Run a single test
- "phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace <dash> with "-", requires xdebug) - "vendor/bin/phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace
<dash> with "-", requires xdebug or phpdbg)
More information: More information:
- http://www.phpunit.de/manual/current/en/textui.html - http://www.phpunit.de/manual/current/en/textui.html
@ -17,34 +18,31 @@
It is safe to remove this file for normal website operation. It is safe to remove this file for normal website operation.
--> -->
<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true"> <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
<testsuite name="Default"> <testsuite name="Default">
<directory>mysite/tests</directory> <directory>mysite/tests</directory>
<directory>vendor/silverstripe/cms/tests/php</directory> <directory>vendor/silverstripe/cms/tests/php</directory>
<directory>vendor/silverstripe/framework/tests/php</directory> <directory>vendor/silverstripe/framework/tests/php</directory>
</testsuite> </testsuite>
<!-- core components --> <!-- framework only -->
<testsuite name="core"> <testsuite name="framework">
<directory>vendor/silverstripe/framework/tests/php/</directory> <directory>vendor/silverstripe/framework/tests/php/</directory>
</testsuite>
<!-- other core components -->
<testsuite name="core">
<directory>vendor/silverstripe/assets/tests/php/</directory> <directory>vendor/silverstripe/assets/tests/php/</directory>
<directory>vendor/silverstripe/versioned/tests/php/</directory> <directory>vendor/silverstripe/versioned/tests/php/</directory>
</testsuite> </testsuite>
<!-- admin components --> <!-- admin components -->
<testsuite name="admin"> <testsuite name="admin">
<directory>vendor/silverstripe/cms/tests/</directory>
<directory>vendor/silverstripe/admin/tests/php/</directory> <directory>vendor/silverstripe/admin/tests/php/</directory>
<directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
<directory>vendor/silverstripe/asset-admin/tests/php/</directory> <directory>vendor/silverstripe/asset-admin/tests/php/</directory>
<directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
<directory>vendor/silverstripe/cms/tests/</directory>
<directory>vendor/silverstripe/graphql/tests/</directory> <directory>vendor/silverstripe/graphql/tests/</directory>
<directory>vendor/silverstripe/siteconfig/tests/php/</directory>
<directory>vendor/silverstripe/reports/tests/</directory> <directory>vendor/silverstripe/reports/tests/</directory>
<directory>vendor/silverstripe/siteconfig/tests/php/</directory>
</testsuite> </testsuite>
<groups>
<exclude>
<group>sanitychecks</group>
</exclude>
</groups>
</phpunit> </phpunit>