aboutsummaryrefslogtreecommitdiffstats
path: root/travis
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-28 23:30:03 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-28 23:30:03 +0200
commita396b647f3d9708ad99d5a9e4b9a1f7f9e3308a2 (patch)
treeedc42d12e92b00b1c35c78c4322c78e2585286c3 /travis
parentf09799322e0248bca09364f147b65d59c57941f5 (diff)
parentb19ee00b9cc8846279fd1e60efaa939b8499e666 (diff)
downloadforums-a396b647f3d9708ad99d5a9e4b9a1f7f9e3308a2.tar
forums-a396b647f3d9708ad99d5a9e4b9a1f7f9e3308a2.tar.gz
forums-a396b647f3d9708ad99d5a9e4b9a1f7f9e3308a2.tar.bz2
forums-a396b647f3d9708ad99d5a9e4b9a1f7f9e3308a2.tar.xz
forums-a396b647f3d9708ad99d5a9e4b9a1f7f9e3308a2.zip
Merge pull request #2282 from bantu/ticket/12384
[ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL. * bantu/ticket/12384: [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/setup-webserver.sh4
1 files changed, 0 insertions, 4 deletions
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index 6188d2c232..bffe2c0bf4 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -28,10 +28,6 @@ then
# Upgrade to a recent stable version of HHVM
sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm-nightly
- # MySQLi is broken in HHVM 3.0.0~precise and still does not work for us in
- # 2014.03.28~saucy, i.e. needs more work. Use MySQL extension for now.
- sed -i "s/mysqli/mysql/" "$DIR/phpunit-mysql-travis.xml"
-
HHVM_LOG=$(realpath "$DIR")/hhvm.log
sudo hhvm \