diff options
| author | Iban Eguia <admin@razican.com> | 2012-06-08 23:01:31 +0200 |
|---|---|---|
| committer | Iban Eguia <admin@razican.com> | 2012-06-08 23:01:31 +0200 |
| commit | 895e98c0f04f1087e8900ce8423ad3210a423770 (patch) | |
| tree | 6adfe487293df38807084599f1f04157b5531e54 /tests/phpunit.xml | |
| parent | 0ed4f63f4268b0c98f549ffd711702fd45a761d0 (diff) | |
| parent | a593c69de4ea125c096f611c78dd0839489e7ebd (diff) | |
Merge remote-tracking branch 'upstream/develop' into new_date
Diffstat (limited to 'tests/phpunit.xml')
| -rw-r--r-- | tests/phpunit.xml | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/tests/phpunit.xml b/tests/phpunit.xml index dfeecd19f..56cb8841c 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <phpunit - bootstrap="Bootstrap.php" + bootstrap="./Bootstrap.php" colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" @@ -11,27 +11,15 @@ stopOnSkipped="false"> <testsuites> <testsuite name="CodeIgniter Core Test Suite"> - <file>./codeigniter/Setup_test.php</file> - <directory suffix="test.php">codeigniter/core</directory> - <directory suffix="test.php">codeigniter/helpers</directory> - <directory suffix="test.php">codeigniter/libraries</directory> - <!-- We'll worry about these later ... - <directory suffix="test.php">codeigniter/libraries</directory> - <directory suffix="test.php">codeigniter/helpers</directory> - --> + <directory suffix="test.php">./codeigniter/core</directory> + <directory suffix="test.php">./codeigniter/helpers</directory> + <directory suffix="test.php">./codeigniter/libraries</directory> </testsuite> </testsuites> <filters> <blacklist> <directory suffix=".php">PEAR_INSTALL_DIR</directory> <directory suffix=".php">PHP_LIBDIR</directory> - <directory suffix=".php">PROJECT_BASE.'tests'</directory> - <directory suffix=".php">'../system/core/CodeIgniter.php'</directory> </blacklist> - <whitelist> - <!-- - <directory suffix=".php">'../system/core'</directory> - --> - </whitelist> </filters> </phpunit>
\ No newline at end of file |