summaryrefslogtreecommitdiffstats
path: root/tests/travis
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-05-16 14:48:13 +0200
committerTimothy Warren <tim@timshomepage.net>2012-05-16 14:48:13 +0200
commit351c2e1b0d3fdca80a5483d708d7c71084226e68 (patch)
tree749c6accebdf6da1c301f9c2ee76c78bfe15954e /tests/travis
parent2ed226bd5ed19754c2fb28d4b98ac5423741f039 (diff)
parent8279420f989a8cda4427c3983ee919c6a1073dd7 (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errors
Diffstat (limited to 'tests/travis')
-rw-r--r--tests/travis/mysql.phpunit.xml8
-rw-r--r--tests/travis/pdo/mysql.phpunit.xml8
-rw-r--r--tests/travis/pdo/pgsql.phpunit.xml8
-rw-r--r--tests/travis/pdo/sqlite.phpunit.xml8
-rw-r--r--tests/travis/pgsql.phpunit.xml8
-rw-r--r--tests/travis/sqlite.phpunit.xml8
6 files changed, 6 insertions, 42 deletions
diff --git a/tests/travis/mysql.phpunit.xml b/tests/travis/mysql.phpunit.xml
index e9556f758..1792ae38d 100644
--- a/tests/travis/mysql.phpunit.xml
+++ b/tests/travis/mysql.phpunit.xml
@@ -14,19 +14,13 @@
</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>
</phpunit> \ No newline at end of file
diff --git a/tests/travis/pdo/mysql.phpunit.xml b/tests/travis/pdo/mysql.phpunit.xml
index 69eece24f..602030d4e 100644
--- a/tests/travis/pdo/mysql.phpunit.xml
+++ b/tests/travis/pdo/mysql.phpunit.xml
@@ -14,19 +14,13 @@
</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>
</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..77e1493c6 100644
--- a/tests/travis/pdo/pgsql.phpunit.xml
+++ b/tests/travis/pdo/pgsql.phpunit.xml
@@ -14,19 +14,13 @@
</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>
</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..cdccef017 100644
--- a/tests/travis/pdo/sqlite.phpunit.xml
+++ b/tests/travis/pdo/sqlite.phpunit.xml
@@ -14,19 +14,13 @@
</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>
</phpunit> \ No newline at end of file
diff --git a/tests/travis/pgsql.phpunit.xml b/tests/travis/pgsql.phpunit.xml
index ad8aeded2..dfc1bff1c 100644
--- a/tests/travis/pgsql.phpunit.xml
+++ b/tests/travis/pgsql.phpunit.xml
@@ -14,19 +14,13 @@
</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>
</phpunit> \ No newline at end of file
diff --git a/tests/travis/sqlite.phpunit.xml b/tests/travis/sqlite.phpunit.xml
index 628370e93..3223da5e7 100644
--- a/tests/travis/sqlite.phpunit.xml
+++ b/tests/travis/sqlite.phpunit.xml
@@ -14,19 +14,13 @@
</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>
</phpunit> \ No newline at end of file