diff options
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | tests/phpunit-mysql.xml | 2 | ||||
| -rwxr-xr-x | tests/travis/prepare_mysql.sh | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 4fac4246a..323c48f7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ addons: - graphviz - ttf-liberation -# enable and start databases? +# enable and start databases on a per job basis #services: # - mariadb # - postgresql @@ -52,7 +52,8 @@ env: - PHPUCOV: "--no-coverage" # use matrix only for PHP and MySQL, all other combinations added through includes matrix: - - DB=mysql + # trusty default MySQL 5.6 + - DB=mysql MYSQL_VERSION=5.6 # Matrix configuration details matrix: @@ -73,7 +74,13 @@ matrix: postgresql: '9.6' services: - postgresql - # Exclude from default matrix combinations + # PHP7.1, old precise distribution with MySQL 5.5 + - php: '7.1' + env: DB=mysql MYSQL_VERSION=5.5 + dist: precise + services: + - mysql + # Excludes from default matrix combinations # exclude: # - php: hhvm # env: DB=pgsql # PDO driver for pgsql is unsupported by HHVM (3rd party install for support) diff --git a/tests/phpunit-mysql.xml b/tests/phpunit-mysql.xml index b421d7a7b..9ba40f087 100644 --- a/tests/phpunit-mysql.xml +++ b/tests/phpunit-mysql.xml @@ -6,7 +6,7 @@ beStrictAboutOutputDuringTests="true" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutTodoAnnotatedTests="true" - processIsolation="true" + processIsolation="false" verbose="true"> <testsuite name="Hubzilla default Test Suite"> <directory suffix="Test.php">./unit/</directory> diff --git a/tests/travis/prepare_mysql.sh b/tests/travis/prepare_mysql.sh index 96a562ac3..92c720205 100755 --- a/tests/travis/prepare_mysql.sh +++ b/tests/travis/prepare_mysql.sh @@ -31,6 +31,8 @@ echo "Preparing for MySQL ..." mysql --version mysql -e "SELECT VERSION();" mysql -e "SHOW VARIABLES LIKE 'max_allowed_packet';" +mysql -e "SHOW VARIABLES LIKE 'collation_%';" +mysql -e "SHOW VARIABLES LIKE 'character_set%';" mysql -e "SELECT @@sql_mode;" # Create Hubzilla database |