diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-04 20:45:14 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-03-04 20:45:14 +0100 |
| commit | 0f2cb79b976086cb73140c25f4c568e865177426 (patch) | |
| tree | e67e0247e540ea8be6c7b37f627c4b13c0f0a586 /tests | |
| parent | ef38f0a6d83025fbd99ace5ec60311acfe9121c4 (diff) | |
| parent | e30e400581a663045486985d0e75bc77631a2ef2 (diff) | |
Merged develop and fixed conflicts.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/phpunit.xml | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/tests/phpunit.xml b/tests/phpunit.xml deleted file mode 100644 index e07aa96a7..000000000 --- a/tests/phpunit.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<phpunit - bootstrap="./Bootstrap.php" - colors="true"> - <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> - <!-- We'll worry about these later ... - <directory suffix="test.php">codeigniter/libraries</directory> - <directory suffix="test.php">codeigniter/helpers</directory> - --> - - </testsuite> - </testsuites> -</phpunit>
\ No newline at end of file |