Merge branch '4' into 5.0

Merge branch '4.13' into 4
Merge pull request #361 from creative-commoners/pulls/4.13/exclude
2023-09-18 11:34:14 +12:00 · 2023-09-18 11:32:55 +12:00 · 2023-09-07 17:16:32 +12:00 · 2023-09-07 14:14:12 +12:00
1 changed files with 1 additions and 3 deletions
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@ -29,9 +29,7 @@
        <!-- Framework ORM tests are split up to run in parallel -->
        <testsuite name="framework-core">
            <directory>vendor/silverstripe/framework/tests/php</directory>
-            <exclude>
-                <directory>vendor/silverstripe/framework/tests/php/ORM</directory>
-            </exclude>
+            <exclude>vendor/silverstripe/framework/tests/php/ORM</exclude>
        </testsuite>
        <testsuite name="framework-orm">
            <directory>vendor/silverstripe/framework/tests/php/ORM</directory>
Author	SHA1	Message	Date
Guy Sartorelli	6119d97ebd	Merge branch '4' into 5.0	2023-09-18 11:34:14 +12:00
Guy Sartorelli	603ffc064b	Merge branch '4.13' into 4	2023-09-18 11:32:55 +12:00
Guy Sartorelli	9372698a6b	Merge pull request #361 from creative-commoners/pulls/4.13/exclude MNT Fix exclude node	2023-09-07 17:16:32 +12:00
Steve Boyd	3887540da7	MNT Fix exclude node	2023-09-07 14:14:12 +12:00