Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MINOR: Simplified phpunit files so that they work with PHPUnit 3.5

  • Loading branch information...
commit 4bb7d6a94017fe245ebe0a0182adcaa8df21d319 1 parent 792df1e
Sam Minnée sminnee authored
Showing with 15 additions and 29 deletions.
  1. +7 −14 phpunit.teamcity.xml
  2. +8 −15 phpunit.xml.dist
21 phpunit.teamcity.xml
View
@@ -1,7 +1,7 @@
<!--
PHPUnit configuration for SilverStripe
- Requires PHPUnit 3.6+
+ Requires PHPUnit 3.5+
Usage:
- "phpunit": Runs all tests in all folders
@@ -16,21 +16,14 @@
for more information on configuration and execution options.
- framework/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
-->
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
+<phpunit bootstrap="framework/tests/bootstrap.php" colors="false" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" syntaxCheck="false" verbose="true" strict="true">
+
<testsuite name="Default">
- <directory>./</directory>
- <exclude>framework/thirdparty/</exclude>
+ <directory>mysite/tests</directory>
+ <directory>cms/tests</directory>
+ <directory>framework/tests</directory>
</testsuite>
- <filter>
- <blacklist>
- <directory suffix=".php">framework/dev/</directory>
- <directory suffix=".php">framework/thirdparty/</directory>
- <directory suffix=".php">cms/thirdparty/</directory>
- <file>framework/tests/PhpSyntaxTest.php</file>
- </blacklist>
- </filter>
-
<listeners>
<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
<listener class="TeamCityListener" file="framework/dev/TeamCityListener.php"/>
@@ -41,4 +34,4 @@
<group>sanitychecks</group>
</exclude>
</groups>
-</phpunit>
+</phpunit>
23 phpunit.xml.dist
View
@@ -1,7 +1,7 @@
<!--
PHPUnit configuration for SilverStripe
- Requires PHPUnit 3.6+
+ Requires PHPUnit 3.5+
Usage:
- "phpunit": Runs all tests in all folders
@@ -16,21 +16,14 @@
for more information on configuration and execution options.
- framework/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
-->
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
+<phpunit bootstrap="framework/tests/bootstrap.php" colors="true" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" syntaxCheck="false" verbose="true" strict="true">
+
<testsuite name="Default">
- <directory>./</directory>
- <exclude>framework/thirdparty/</exclude>
+ <directory>mysite/tests</directory>
+ <directory>cms/tests</directory>
+ <directory>framework/tests</directory>
</testsuite>
-
- <filter>
- <blacklist>
- <directory suffix=".php">framework/dev/</directory>
- <directory suffix=".php">framework/thirdparty/</directory>
- <directory suffix=".php">cms/thirdparty/</directory>
- <file>framework/tests/PhpSyntaxTest.php</file>
- </blacklist>
- </filter>
-
+
<listeners>
<listener class="SS_TestListener" file="framework/dev/TestListener.php" />
</listeners>
@@ -40,4 +33,4 @@
<group>sanitychecks</group>
</exclude>
</groups>
-</phpunit>
+</phpunit>
Please sign in to comment.
Something went wrong with that request. Please try again.