Merge branch 'hotfix/fix-testsuite'

Author: mblaschke

BLACKLIST

@@ -1,2 +1,3 @@
 ubuntu-16.04
-debian-9
+debian-9
+alpine-3-php7

test/run.sh

@@ -294,11 +294,46 @@ initEnvironment
 
 [[ $(checkTestTarget php) ]] && {
     setupTestEnvironment "php"
+
+    ##########
+    # PHP 5
+    ##########
+
     setSpecTest "php5"
 
+    OS_VERSION="12.04" runTestForTag "ubuntu-12.04"
+    OS_VERSION="14.04" runTestForTag "ubuntu-14.04"
+    OS_VERSION="15.04" runTestForTag "ubuntu-15.04"
+    OS_VERSION="15.10" runTestForTag "ubuntu-15.10"
+    OS_VERSION="16.04" runTestForTag "ubuntu-16.04"
+
+    setEnvironmentOsFamily "redhat"
+    OS_VERSION="7" runTestForTag "centos-7"
+
+    setEnvironmentOsFamily "debian"
+    OS_VERSION="7" runTestForTag "debian-7"
+    OS_VERSION="8" runTestForTag "debian-8"
+    OS_VERSION="testing" runTestForTag "debian-9"
+
     setEnvironmentOsFamily "alpine"
     OS_VERSION="3" runTestForTag "alpine-3"
 
+    ##########
+    # PHP 7
+    ##########
+
+    setEnvironmentOsFamily "ubuntu"
+    setSpecTest "php7"
+    OS_VERSION="16.04" runTestForTag "ubuntu-16.04-php7"
+
+    setEnvironmentOsFamily "debian"
+    setSpecTest "php7"
+    OS_VERSION="8" runTestForTag "debian-8-php7"
+    OS_VERSION="testing" runTestForTag "debian-9-php7"
+
+    setEnvironmentOsFamily "alpine"
+    OS_VERSION="3" runTestForTag "alpine-3-php7"
+
     waitForTestRun
 }
 
@@ -362,6 +397,11 @@ initEnvironment
 
 [[ $(checkTestTarget php-apache) ]] && {
     setupTestEnvironment "php-apache"
+
+    ##########
+    # PHP 5
+    ##########
+
     setSpecTest "php5-apache"
 
     OS_VERSION="12.04" runTestForTag "ubuntu-12.04"
@@ -381,6 +421,10 @@ initEnvironment
     setEnvironmentOsFamily "alpine"
     OS_VERSION="3" runTestForTag "alpine-3"
 
+    ##########
+    # PHP 7
+    ##########
+
     setEnvironmentOsFamily "ubuntu"
     setSpecTest "php7-apache"
     OS_VERSION="16.04" runTestForTag "ubuntu-16.04-php7"
@@ -390,6 +434,9 @@ initEnvironment
     OS_VERSION="8" runTestForTag "debian-8-php7"
     OS_VERSION="testing" runTestForTag "debian-9-php7"
 
+    setEnvironmentOsFamily "alpine"
+    OS_VERSION="3" runTestForTag "alpine-3-php7"
+
     waitForTestRun
 }
 
@@ -399,6 +446,11 @@ initEnvironment
 
 [[ $(checkTestTarget php-nginx) ]] && {
     setupTestEnvironment "php-nginx"
+
+    ##########
+    # PHP 5
+    ##########
+
     setSpecTest "php5-nginx"
 
     OS_VERSION="12.04" runTestForTag "ubuntu-12.04"
@@ -418,6 +470,10 @@ initEnvironment
     setEnvironmentOsFamily "alpine"
     OS_VERSION="3" runTestForTag "alpine-3"
 
+    ##########
+    # PHP 7
+    ##########
+
     setEnvironmentOsFamily "ubuntu"
     setSpecTest "php7-nginx"
     OS_VERSION="16.04" runTestForTag "ubuntu-16.04-php7"
@@ -427,6 +483,9 @@ initEnvironment
     OS_VERSION="8" runTestForTag "debian-8-php7"
     OS_VERSION="testing" runTestForTag "debian-9-php7"
 
+    setEnvironmentOsFamily "alpine"
+    OS_VERSION="3" runTestForTag "alpine-3-php7"
+
     waitForTestRun
 }