diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-15 13:36:42 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-15 13:36:42 -0700 |
| commit | 437d38bc05390c2eb1323aa2e43f3f1c8df81391 (patch) | |
| tree | 5ae17073d60475143e4e500ea17861a553cd51c4 /travis | |
| parent | 3521dfc2787a532365dba12eec669579d15d79f2 (diff) | |
| parent | 813170033006d6615071700d36ce3ba454e87753 (diff) | |
| download | forums-437d38bc05390c2eb1323aa2e43f3f1c8df81391.tar forums-437d38bc05390c2eb1323aa2e43f3f1c8df81391.tar.gz forums-437d38bc05390c2eb1323aa2e43f3f1c8df81391.tar.bz2 forums-437d38bc05390c2eb1323aa2e43f3f1c8df81391.tar.xz forums-437d38bc05390c2eb1323aa2e43f3f1c8df81391.zip | |
Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop
* github-phpbb/develop-olympus:
[ticket/11920] Have to use empty root password otherwise db creation fails.
[ticket/11920] Add MariaDB environment to Travis-CI.
Conflicts:
.travis.yml
Diffstat (limited to 'travis')
| -rw-r--r-- | travis/phpunit-mariadb-travis.xml | 41 | ||||
| -rwxr-xr-x | travis/setup-mariadb.sh | 33 |
2 files changed, 74 insertions, 0 deletions
diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml new file mode 100644 index 0000000000..1eaee5b7d8 --- /dev/null +++ b/travis/phpunit-mariadb-travis.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<phpunit backupGlobals="true" + backupStaticAttributes="true" + colors="true" + convertErrorsToExceptions="true" + convertNoticesToExceptions="true" + convertWarningsToExceptions="true" + processIsolation="false" + stopOnFailure="false" + syntaxCheck="true" + strict="true" + verbose="true" + bootstrap="../tests/bootstrap.php"> + <testsuites> + <testsuite name="phpBB Test Suite"> + <directory suffix="_test.php">../tests/</directory> + <exclude>tests/functional</exclude> + <exclude>tests/lint_test.php</exclude> + </testsuite> + <testsuite name="phpBB Functional Tests"> + <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> + </testsuite> + </testsuites> + + <groups> + <exclude> + <group>slow</group> + </exclude> + </groups> + + <php> + <server name="PHPBB_TEST_DBMS" value="mysqli" /> + <server name="PHPBB_TEST_DBHOST" value="0.0.0.0" /> + <server name="PHPBB_TEST_DBPORT" value="3306" /> + <server name="PHPBB_TEST_DBNAME" value="phpbb_tests" /> + <server name="PHPBB_TEST_DBUSER" value="root" /> + <server name="PHPBB_TEST_DBPASSWD" value="" /> + <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/> + <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" /> + </php> +</phpunit> diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh new file mode 100755 index 0000000000..2e974da8eb --- /dev/null +++ b/travis/setup-mariadb.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# +# @copyright (c) 2013 phpBB Group +# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +# +set -e + +# MariaDB Series +VERSION='5.5' + +# Operating system codename, e.g. "precise" +OS_CODENAME=$(lsb_release --codename --short) + +if ! which add-apt-repository > /dev/null +then + sudo apt-get update -qq + sudo apt-get install -qq python-software-properties +fi + +sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db +sudo add-apt-repository "deb http://ftp.osuosl.org/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" +sudo apt-get update -qq + +sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd" +sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd" +sudo apt-get install -qq mariadb-server + +# Set root password to empty string. +echo " +USE mysql; +UPDATE user SET Password = PASSWORD('') where User = 'root'; +FLUSH PRIVILEGES; +" | mysql -u root -prootpasswd |