Use fixed run-tests script to run phpt tests and compile on debian buster (#998)

* Use fixed run-tests.php from PHP8.0
* modified run-tests.php
* build everything using debian buster
* run package tests on debian buster

Author: intuibase

.ci/static-check-unit-test.sh

@@ -27,19 +27,38 @@ trap onScriptExit EXIT
 
 ensureSyslogIsRunning
 
-## This make runs PHPT
-# Disable agent for auxiliary PHP processes to reduce noise in logs
-export ELASTIC_APM_ENABLED=false
+
+PHP_EXECUTABLE=$(which php)
+
+RUN_TESTS=$APP_FOLDER/src/ext/tests/run-tests.php
+AGENT_EXTENSION_DIR=$APP_FOLDER/src/ext/modules
+AGENT_EXTENSION=$AGENT_EXTENSION_DIR/elastic_apm.so
+
+# ## This runs PHPT
+# # Disable agent for auxiliary PHP processes to reduce noise in logs
+export ELASTIC_APM_ENABLED=true
 for phptFile in ./tests/*.phpt; do
     msg="Running tests in \`${phptFile}' ..."
     echo "${msg}"
     this_script_name="$( basename "${BASH_SOURCE[0]}" )"
     logger -t "${this_script_name}" "${msg}"
 
     # Disable exit-on-error
-    set +e
-    make test TESTS="--show-all ${phptFile}"
+    # set +e
+    TESTS="--show-all ${phptFile}"
+
+    INI_FILE=`php -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`
+
+    if test "$INI_FILE"; then
+        egrep -h -v $PHP_DEPRECATED_DIRECTIVES_REGEX "$INI_FILE" > /tmp/tmp-php.ini
+    else
+        echo > /tmp/tmp-php.ini
+    fi
+
+    TEST_PHP_SRCDIR=$APP_FOLDER/src/ext TEST_PHP_EXECUTABLE=$PHP_EXECUTABLE $PHP_EXECUTABLE -n -c /tmp/tmp-php.ini $PHP_TEST_SETTINGS $RUN_TESTS -n -c /tmp/tmp-php.ini -d extension_dir=$AGENT_EXTENSION_DIR -d extension=$AGENT_EXTENSION  $PHP_TEST_SHARED_EXTENSIONS $TESTS
     exitCode=$?
+    rm /tmp/tmp-php.ini
+
 
     if [ ${exitCode} -ne 0 ] ; then
         echo "Tests in \`${phptFile}' failed"

Dockerfile

@@ -1,5 +1,5 @@
 ARG PHP_VERSION=7.2
-FROM php:${PHP_VERSION}-fpm
+FROM php:${PHP_VERSION}-fpm-buster
 
 RUN apt-get -qq update \
     && apt-get -qq -y --no-install-recommends install \
@@ -52,8 +52,3 @@ CMD phpize \
 
 # Create a link to extensions directory to make it easier accessible (paths are different between php releases)
 RUN ln -s `find /usr/local/lib/php/extensions/ -name opcache.so | head -n1 | xargs dirname` /tmp/extensions
-
-# Patch run-tests.php to handle SKIPIF correctly in tests with agent debug logs enabled
-RUN find /usr/local/lib/php/ -name run-tests.php | xargs sed -i 's#if (!strncasecmp(\x27skip\x27, ltrim(\$output), 4))#if (!strncasecmp(\x27skip\x27, ltrim(\$output), 4) || strstr(\$output, \x27ElasticApmSkipTest\x27))#g'
-
-RUN find /usr/local/lib/php/ -name run-tests.php | xargs sed -i 's#system_with_timeout("\$extra \$php \$pass_options -q \$ini_settings \$no_file_cache -d display_errors=0 \\"\$test_skipif\\"", \$env)#system_with_timeout("\$extra \$php \$pass_options -q \$ini_settings \$no_file_cache -d display_errors=0 \\"\$test_skipif\\" 2>\&1", \$env)#g'

Dockerfile.alpine

@@ -54,8 +54,3 @@ CMD export CFLAGS="-std=gnu99 ${CFLAGS}" ; \
 
 # Create a link to extensions directory to make it easier accessible (paths are different between php releases)
 RUN ln -s `find /usr/local/lib/php/extensions/ -name opcache.so | head -n1 | xargs dirname` /tmp/extensions
-
-# Patch run-tests.php to handle SKIPIF correctly in tests with agent debug logs enabled
-RUN find /usr/local/lib/php/ -name run-tests.php | xargs sed -i 's#if (!strncasecmp(\x27skip\x27, ltrim(\$output), 4))#if (!strncasecmp("skip", ltrim(\$output), 4) || strstr(\$output, "ElasticApmSkipTest"))#g'
-
-RUN find /usr/local/lib/php/ -name run-tests.php | xargs sed -i 's#system_with_timeout("\$extra \$php \$pass_options -q \$ini_settings \$no_file_cache -d display_errors=0 \\"\$test_skipif\\"", \$env)#system_with_timeout("\$extra \$php \$pass_options -q \$ini_settings \$no_file_cache -d display_errors=0 \\"\$test_skipif\\" 2>\&1", \$env)#g'

packaging/test/ubuntu/Dockerfile

@@ -1,5 +1,5 @@
 ARG PHP_VERSION=7.2
-FROM php:${PHP_VERSION}-fpm
+FROM php:${PHP_VERSION}-fpm-buster
 
 RUN apt-get -qq update \
     && apt-get -qq -y --no-install-recommends install \