diff options
| author | Anton Lindqvist <anton@qvister.se> | 2012-06-08 10:09:47 +0200 |
|---|---|---|
| committer | Anton Lindqvist <anton@qvister.se> | 2012-06-08 10:09:47 +0200 |
| commit | 94c6b1f1c02466178c1f8e144542d753f27dd3d8 (patch) | |
| tree | 8e8ca4b8383e2481b0a689fd07fc230013531822 /tests/travis/sqlite.phpunit.xml | |
| parent | 6581cac4d2b5fef69478ce1a5c3464200bfcbba5 (diff) | |
| parent | c78e56a7df140ee777ffc67687877f3e70c77e28 (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Conflicts:
system/libraries/Cache/Cache.php
Diffstat (limited to 'tests/travis/sqlite.phpunit.xml')
| -rw-r--r-- | tests/travis/sqlite.phpunit.xml | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/tests/travis/sqlite.phpunit.xml b/tests/travis/sqlite.phpunit.xml index 74ebb482b..701165734 100644 --- a/tests/travis/sqlite.phpunit.xml +++ b/tests/travis/sqlite.phpunit.xml @@ -14,24 +14,12 @@ </php> <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> - <directory suffix="test.php">../codeigniter/database</directory> + <directory suffix="test.php">../codeigniter</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> + <filter> + <whitelist addUncoveredFilesFromWhitelist="true"> + <directory suffix=".php">../../system</directory> + </whitelist> + </filter> </phpunit>
\ No newline at end of file |