Merge branch '4' into 5.0
This commit is contained in:
commit
6119d97ebd
|
@ -29,9 +29,7 @@
|
||||||
<!-- Framework ORM tests are split up to run in parallel -->
|
<!-- Framework ORM tests are split up to run in parallel -->
|
||||||
<testsuite name="framework-core">
|
<testsuite name="framework-core">
|
||||||
<directory>vendor/silverstripe/framework/tests/php</directory>
|
<directory>vendor/silverstripe/framework/tests/php</directory>
|
||||||
<exclude>
|
<exclude>vendor/silverstripe/framework/tests/php/ORM</exclude>
|
||||||
<directory>vendor/silverstripe/framework/tests/php/ORM</directory>
|
|
||||||
</exclude>
|
|
||||||
</testsuite>
|
</testsuite>
|
||||||
<testsuite name="framework-orm">
|
<testsuite name="framework-orm">
|
||||||
<directory>vendor/silverstripe/framework/tests/php/ORM</directory>
|
<directory>vendor/silverstripe/framework/tests/php/ORM</directory>
|
||||||
|
|
Loading…
Reference in New Issue