summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid <ottodavid@gmx.net>2014-08-05 22:44:51 +0200
committerDavid <ottodavid@gmx.net>2014-08-22 12:41:58 +0200
commit189f927ff3dfe8dfa0adb62a66ab240e84c8eb54 (patch)
tree13c8c79947484bf3e0c72656555b44432004a7bc
parent6d626d0626bd0a0fe7053d09af5196f2ff796a07 (diff)
Disable coverage measurement for PHP 5.3 tests
In order to avoid segfaulting tests (cherry picked from commit b682cf8ede7f60d770d39b1d48e6f15fd796774b)
-rw-r--r--.travis.yml5
-rw-r--r--travis.php.ini1
2 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index f9d65a82..b6badb3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,9 @@ before_script:
- composer self-update
- composer install --prefer-source --dev
- export PATH=./bin/:$PATH
- - phpenv config-add travis.php.ini
script:
- - ./bin/phing coverage
+ - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "5.3" ]; then phing test; else phing coverage ; fi;'
after_script:
- - php ./bin/coveralls -v \ No newline at end of file
+ - php ./bin/coveralls -v
diff --git a/travis.php.ini b/travis.php.ini
deleted file mode 100644
index 03a47372..00000000
--- a/travis.php.ini
+++ /dev/null
@@ -1 +0,0 @@
-memory_limit = 1024M \ No newline at end of file