Merged with latest commit
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..c5a9993
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: php
+
+phps:
+ - 5.2
+ - 5.3
+ - 5.4
+
+before_script:
+ - pyrus channel-discover pear.php-tools.net
+ - pyrus install http://pear.php-tools.net/get/vfsStream-0.11.2.tgz
+ - phpenv rehash
+
+script: phpunit --configuration phpunit.xml
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
index 07f5a19..aca7809 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="tests/Bootstrap.php" colors="true">
+<phpunit
+ bootstrap="tests/Bootstrap.php"
+ colors="true"
+ convertNoticesToExceptions="true"
+ convertWarningsToExceptions="true"
+ stopOnError="false"
+ stopOnFailure="false"
+ stopOnIncomplete="false"
+ stopOnSkipped="false">
<testsuites>
<testsuite name="CodeIgniter Core Test Suite">
<file>tests/codeigniter/Setup_test.php</file>
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 657671a..28c63f0 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -19,12 +19,12 @@
// Omit files in the PEAR & PHP Paths from ending up in the coverage report
-PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PEAR_INSTALL_DIR);
-PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PHP_LIBDIR);
-PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PROJECT_BASE.'tests');
+// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PEAR_INSTALL_DIR);
+// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PHP_LIBDIR);
+// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(PROJECT_BASE.'tests');
// Omit Tests from the coverage reports.
// PHP_CodeCoverage_Filter::getInstance()->addDirectoryToWhiteList('../system/core');
-PHP_CodeCoverage_Filter::getInstance()->addFileToBlackList('../system/core/CodeIgniter.php');
+// PHP_CodeCoverage_Filter::getInstance()->addFileToBlackList('../system/core/CodeIgniter.php');
unset($dir);
\ No newline at end of file
diff --git a/tests/README.md b/tests/README.md
index ad80516..6d83c34 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,5 +1,7 @@
# CodeIgniter Unit Tests #
+Status : [](http://travis-ci.org/EllisLab/CodeIgniter)
+
*Do not merge to default until these issues have been addressed*
- Clean up naming conventions