diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-07 21:25:16 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-07 21:25:16 +0200 |
| commit | 27af930d4ed1daf9f2710b005d103c7f1c7d919d (patch) | |
| tree | ffe257a549ae70749dcf4646695a0d73535e237e /tests/travis/pdo | |
| parent | 87ac4260063e3a62805cc8f6f73cd2eb18da663a (diff) | |
| parent | 928b9aa6340654b1dbb69af44c41468456f0b7b6 (diff) | |
Merge upstream branch
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 |