diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-06 13:12:15 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-06 13:12:15 +0200 |
| commit | 968690491f625ddf59a5136b55ae1b9a2cf98a9a (patch) | |
| tree | 6bc3eff6e8ec3ecae925ac3ff5c9542888f160f4 /tests/travis/pdo | |
| parent | 58dc75471c25f33b059967ffb515eedc08e86a0b (diff) | |
| parent | 6683c3c872952ae16d98c89ef474e5522897592a (diff) | |
Merge upstream branch and some changes for better readability
Diffstat (limited to 'tests/travis/pdo')
| -rw-r--r-- | tests/travis/pdo/mysql.phpunit.xml | 19 | ||||
| -rw-r--r-- | tests/travis/pdo/pgsql.phpunit.xml | 19 | ||||
| -rw-r--r-- | tests/travis/pdo/sqlite.phpunit.xml | 19 |
3 files changed, 18 insertions, 39 deletions
diff --git a/tests/travis/pdo/mysql.phpunit.xml b/tests/travis/pdo/mysql.phpunit.xml index 69eece24f..c3113a66f 100644 --- a/tests/travis/pdo/mysql.phpunit.xml +++ b/tests/travis/pdo/mysql.phpunit.xml @@ -14,19 +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> - </filters> + <filter> + <whitelist addUncoveredFilesFromWhitelist="true"> + <directory suffix=".php">../../../system</directory> + </whitelist> + </filter> </phpunit>
\ No newline at end of file diff --git a/tests/travis/pdo/pgsql.phpunit.xml b/tests/travis/pdo/pgsql.phpunit.xml index e68c3e028..232025523 100644 --- a/tests/travis/pdo/pgsql.phpunit.xml +++ b/tests/travis/pdo/pgsql.phpunit.xml @@ -14,19 +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> - </filters> + <filter> + <whitelist addUncoveredFilesFromWhitelist="true"> + <directory suffix=".php">../../../system</directory> + </whitelist> + </filter> </phpunit>
\ No newline at end of file diff --git a/tests/travis/pdo/sqlite.phpunit.xml b/tests/travis/pdo/sqlite.phpunit.xml index 1871f6221..3d1256721 100644 --- a/tests/travis/pdo/sqlite.phpunit.xml +++ b/tests/travis/pdo/sqlite.phpunit.xml @@ -14,19 +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> - </filters> + <filter> + <whitelist addUncoveredFilesFromWhitelist="true"> + <directory suffix=".php">../../../system</directory> + </whitelist> + </filter> </phpunit>
\ No newline at end of file |