aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/phpunit-mysql.xml2
-rwxr-xr-xtests/travis/prepare_mysql.sh2
2 files changed, 3 insertions, 1 deletions
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