Browse Source

Renamed phpunit file

* also changed travis definition. Cannot fail in PHP 5.5
* Removed from gitignore phpunit.xml
Marc 11 years ago
parent
commit
58e2e6b984
3 changed files with 1 additions and 6 deletions
  1. 0 1
      .gitignore
  2. 1 5
      .travis.yml
  3. 0 0
      phpunit.xml

+ 0 - 1
.gitignore

@@ -2,6 +2,5 @@ Tests/Functional/cache
 Tests/Functional/logs
 composer.lock
 composer.phar
-phpunit.xml
 phpcs.log
 vendor

+ 1 - 5
.travis.yml

@@ -5,10 +5,6 @@ php:
     - 5.4
     - 5.5
 
-matrix:
-    allow_failures:
-        - php: 5.5
-
 before_script:
   - sh -c "sudo apt-get install uuid-dev"
   - curl -L -o libevent-1.4.14b-stable.tar.gz https://github.com/downloads/libevent/libevent/libevent-1.4.14b-stable.tar.gz
@@ -24,7 +20,7 @@ before_script:
   - composer install --prefer-source --no-interaction
 
 script:
-  - phpunit -c phpunit.xml.dist --coverage-text
+  - phpunit -c phpunit.xml --coverage-text
 
 notifications:
     email: false

phpunit.xml.dist → phpunit.xml