Skip to content

Commit

Permalink
Merge pull request #1438 from xnoguer/pr_grep_3.8
Browse files Browse the repository at this point in the history 
PR grep 3.8
  • Loading branch information
@mboelen
mboelen committed May 14, 2024
2 parents e8facbd + a5dbda5 commit bf54ba6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 65 deletions.
2 changes: 1 addition & 1 deletion include/tests_kernel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@
else
# Match on items like /boot/vm5.3.7 or /boot/vmlinuz-5.3.7-1-default. Sort based on versions (-v) and then find the last item
# Note: ignore a rescue kernel (e.g. CentOS)
FOUND_VMLINUZ=$(${LSBINARY} -v ${ROOTDIR}boot/vm[l0-9]* 2> /dev/null | ${GREPBINARY} -v '\-rescue\-' | ${TAILBINARY} -1)
FOUND_VMLINUZ=$(${LSBINARY} -v ${ROOTDIR}boot/vm[l0-9]* 2> /dev/null | ${GREPBINARY} -v '\-rescue-' | ${TAILBINARY} -1)
LogText "Result: found ${FOUND_VMLINUZ}"
fi

Expand Down
68 changes: 4 additions & 64 deletions include/tests_php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@
${ROOTDIR}etc/php7.2/php.ini \
${ROOTDIR}etc/php7.3/php.ini \
${ROOTDIR}etc/php7.4/php.ini \
${ROOTDIR}etc/php8.0/php.ini \
${ROOTDIR}etc/php8.1/php.ini \
${ROOTDIR}etc/php8.2/php.ini \
${ROOTDIR}etc/php/cgi-php5/php.ini \
${ROOTDIR}etc/php/cli-php5/php.ini \
${ROOTDIR}etc/php/apache2-php5/php.ini \
Expand All @@ -50,42 +47,27 @@
${ROOTDIR}etc/php/apache2-php7.2/php.ini \
${ROOTDIR}etc/php/apache2-php7.3/php.ini \
${ROOTDIR}etc/php/apache2-php7.4/php.ini \
${ROOTDIR}etc/php/apache2-php8.0/php.ini \
${ROOTDIR}etc/php/apache2-php8.1/php.ini \
${ROOTDIR}etc/php/apache2-php8.2/php.ini \
${ROOTDIR}etc/php/cgi-php5.5/php.ini \
${ROOTDIR}etc/php/cgi-php5.6/php.ini \
${ROOTDIR}etc/php/cgi-php7.0/php.ini \
${ROOTDIR}etc/php/cgi-php7.1/php.ini \
${ROOTDIR}etc/php/cgi-php7.2/php.ini \
${ROOTDIR}etc/php/cgi-php7.3/php.ini \
${ROOTDIR}etc/php/cgi-php7.4/php.ini \
${ROOTDIR}etc/php/cgi-php8.0/php.ini \
${ROOTDIR}etc/php/cgi-php8.1/php.ini \
${ROOTDIR}etc/php/cgi-php8.2/php.ini \
${ROOTDIR}etc/php/cli-php5.5/php.ini \
${ROOTDIR}etc/php/cli-php5.6/php.ini \
${ROOTDIR}etc/php/cli-php7.0/php.ini \
${ROOTDIR}etc/php/cli-php7.1/php.ini \
${ROOTDIR}etc/php/cli-php7.2/php.ini \
${ROOTDIR}etc/php/cli-php7.3/php.ini \
${ROOTDIR}etc/php/cli-php7.4/php.ini \
${ROOTDIR}etc/php/cli-php8.0/php.ini \
${ROOTDIR}etc/php/cli-php8.1/php.ini \
${ROOTDIR}etc/php/cli-php8.2/php.ini \
${ROOTDIR}etc/php/embed-php5.5/php.ini \
${ROOTDIR}etc/php/embed-php5.6/php.ini \
${ROOTDIR}etc/php/embed-php7.0/php.ini \
${ROOTDIR}etc/php/embed-php7.1/php.ini \
${ROOTDIR}etc/php/embed-php7.2/php.ini \
${ROOTDIR}etc/php/embed-php7.3/php.ini \
${ROOTDIR}etc/php/embed-php7.4/php.ini \
${ROOTDIR}etc/php/embed-php8.0/php.ini \
${ROOTDIR}etc/php/embed-php8.1/php.ini \
${ROOTDIR}etc/php/embed-php8.2/php.ini \
${ROOTDIR}etc/php/fpm-php8.2/php.ini \
${ROOTDIR}etc/php/fpm-php8.1/php.ini \
${ROOTDIR}etc/php/fpm-php8.0/php.ini \
${ROOTDIR}etc/php/fpm-php7.4/php.ini \
${ROOTDIR}etc/php/fpm-php7.3/php.ini \
${ROOTDIR}etc/php/fpm-php7.2/php.ini \
Expand All @@ -106,9 +88,6 @@
${ROOTDIR}etc/php/7.2/apache2/php.ini \
${ROOTDIR}etc/php/7.3/apache2/php.ini \
${ROOTDIR}etc/php/7.4/apache2/php.ini \
${ROOTDIR}etc/php/8.0/apache2/php.ini \
${ROOTDIR}etc/php/8.1/apache2/php.ini \
${ROOTDIR}etc/php/8.2/apache2/php.ini \
${ROOTDIR}etc/php/7.0/cli/php.ini \
${ROOTDIR}etc/php/7.0/fpm/php.ini \
${ROOTDIR}etc/php/7.1/cli/php.ini \
Expand All @@ -119,12 +98,6 @@
${ROOTDIR}etc/php/7.3/fpm/php.ini \
${ROOTDIR}etc/php/7.4/cli/php.ini \
${ROOTDIR}etc/php/7.4/fpm/php.ini \
${ROOTDIR}etc/php/8.0/cli/php.ini \
${ROOTDIR}etc/php/8.0/fpm/php.ini \
${ROOTDIR}etc/php/8.1/cli/php.ini \
${ROOTDIR}etc/php/8.1/fpm/php.ini \
${ROOTDIR}etc/php/8.2/cli/php.ini \
${ROOTDIR}etc/php/8.2/fpm/php.ini \
${ROOTDIR}var/www/conf/php.ini \
${ROOTDIR}usr/local/etc/php.ini \
${ROOTDIR}usr/local/lib/php.ini \
Expand All @@ -136,9 +109,6 @@
${ROOTDIR}usr/local/php72/lib/php.ini \
${ROOTDIR}usr/local/php73/lib/php.ini \
${ROOTDIR}usr/local/php74/lib/php.ini \
${ROOTDIR}usr/local/php80/lib/php.ini \
${ROOTDIR}usr/local/php81/lib/php.ini \
${ROOTDIR}usr/local/php82/lib/php.ini \
${ROOTDIR}usr/local/zend/etc/php.ini \
${ROOTDIR}usr/pkg/etc/php.ini \
${ROOTDIR}opt/cpanel/ea-php54/root/etc/php.ini \
Expand All @@ -149,9 +119,6 @@
${ROOTDIR}opt/cpanel/ea-php72/root/etc/php.ini \
${ROOTDIR}opt/cpanel/ea-php73/root/etc/php.ini \
${ROOTDIR}opt/cpanel/ea-php74/root/etc/php.ini \
${ROOTDIR}opt/cpanel/ea-php80/root/etc/php.ini \
${ROOTDIR}opt/cpanel/ea-php81/root/etc/php.ini \
${ROOTDIR}opt/cpanel/ea-php82/root/etc/php.ini \
${ROOTDIR}opt/alt/php44/etc/php.ini \
${ROOTDIR}opt/alt/php51/etc/php.ini \
${ROOTDIR}opt/alt/php52/etc/php.ini \
Expand All @@ -164,47 +131,32 @@
${ROOTDIR}opt/alt/php72/etc/php.ini \
${ROOTDIR}opt/alt/php73/etc/php.ini \
${ROOTDIR}opt/alt/php74/etc/php.ini \
${ROOTDIR}opt/alt/php80/etc/php.ini \
${ROOTDIR}opt/alt/php81/etc/php.ini \
${ROOTDIR}opt/alt/php82/etc/php.ini \
${ROOTDIR}etc/opt/remi/php56/php.ini \
${ROOTDIR}etc/opt/remi/php70/php.ini \
${ROOTDIR}etc/opt/remi/php71/php.ini \
${ROOTDIR}etc/opt/remi/php72/php.ini \
${ROOTDIR}etc/opt/remi/php73/php.ini \
${ROOTDIR}etc/opt/remi/php74/php.ini \
${ROOTDIR}etc/opt/remi/php80/php.ini \
${ROOTDIR}etc/opt/remi/php81/php.ini \
${ROOTDIR}etc/opt/remi/php82/php.ini"
${ROOTDIR}etc/opt/remi/php74/php.ini"
# HEADS-UP: OpenBSD, last two releases are supported, and snapshots of -current
PHPINILOCS="${PHPINILOCS} \
${ROOTDIR}etc/php-5.6.ini \
${ROOTDIR}etc/php-7.0.ini \
${ROOTDIR}etc/php-7.1.ini \
${ROOTDIR}etc/php-7.2.ini \
${ROOTDIR}etc/php-7.3.ini \
${ROOTDIR}etc/php-7.4.ini \
${ROOTDIR}etc/php-8.0.ini \
${ROOTDIR}etc/php-8.1.ini \
${ROOTDIR}etc/php-8.2.ini"
${ROOTDIR}etc/php-7.4.ini"

PHPINIDIRS="${ROOTDIR}etc/php5/conf.d \
${ROOTDIR}etc/php/7.0/cli/conf.d \
${ROOTDIR}etc/php/7.1/cli/conf.d \
${ROOTDIR}etc/php/7.2/cli/conf.d \
${ROOTDIR}etc/php/7.3/cli/conf.d \
${ROOTDIR}etc/php/7.4/cli/conf.d \
${ROOTDIR}etc/php/8.0/cli/conf.d \
${ROOTDIR}etc/php/8.1/cli/conf.d \
${ROOTDIR}etc/php/8.2/cli/conf.d \
${ROOTDIR}etc/php/7.0/fpm/conf.d \
${ROOTDIR}etc/php/7.1/fpm/conf.d \
${ROOTDIR}etc/php/7.2/fpm/conf.d \
${ROOTDIR}etc/php/7.3/fpm/conf.d \
${ROOTDIR}etc/php/7.4/fpm/conf.d \
${ROOTDIR}etc/php/8.0/fpm/conf.d \
${ROOTDIR}etc/php/8.1/fpm/conf.d \
${ROOTDIR}etc/php/8.2/fpm/conf.d \
${ROOTDIR}etc/php.d \
${ROOTDIR}opt/cpanel/ea-php54/root/etc/php.d \
${ROOTDIR}opt/cpanel/ea-php55/root/etc/php.d \
Expand All @@ -214,9 +166,6 @@
${ROOTDIR}opt/cpanel/ea-php72/root/etc/php.d \
${ROOTDIR}opt/cpanel/ea-php73/root/etc/php.d \
${ROOTDIR}opt/cpanel/ea-php74/root/etc/php.d \
${ROOTDIR}opt/cpanel/ea-php80/root/etc/php.d \
${ROOTDIR}opt/cpanel/ea-php81/root/etc/php.d \
${ROOTDIR}opt/cpanel/ea-php82/root/etc/php.d \
${ROOTDIR}opt/alt/php44/etc/php.d.all \
${ROOTDIR}opt/alt/php51/etc/php.d.all \
${ROOTDIR}opt/alt/php52/etc/php.d.all \
Expand All @@ -229,29 +178,20 @@
${ROOTDIR}opt/alt/php72/etc/php.d.all \
${ROOTDIR}opt/alt/php73/etc/php.d.all \
${ROOTDIR}opt/alt/php74/etc/php.d.all \
${ROOTDIR}opt/alt/php80/etc/php.d.all \
${ROOTDIR}opt/alt/php81/etc/php.d.all \
${ROOTDIR}opt/alt/php82/etc/php.d.all \
${ROOTDIR}usr/local/lib/php.conf.d \
${ROOTDIR}usr/local/php70/lib/php.conf.d \
${ROOTDIR}usr/local/php71/lib/php.conf.d \
${ROOTDIR}usr/local/php72/lib/php.conf.d \
${ROOTDIR}usr/local/php73/lib/php.conf.d \
${ROOTDIR}usr/local/php74/lib/php.conf.d \
${ROOTDIR}usr/local/php80/lib/php.conf.d \
${ROOTDIR}usr/local/php81/lib/php.conf.d \
${ROOTDIR}usr/local/php82/lib/php.conf.d"
${ROOTDIR}usr/local/php74/lib/php.conf.d"
# HEADS-UP: OpenBSD, last two releases are supported, and snapshots of -current
PHPINIDIRS="${PHPINIDIRS} \
${ROOTDIR}etc/php-5.6 \
${ROOTDIR}etc/php-7.0 \
${ROOTDIR}etc/php-7.1 \
${ROOTDIR}etc/php-7.2 \
${ROOTDIR}etc/php-7.3 \
${ROOTDIR}etc/php-7.4 \
${ROOTDIR}etc/php-8.0 \
${ROOTDIR}etc/php-8.1 \
${ROOTDIR}etc/php-8.2"
${ROOTDIR}etc/php-7.4"
#
#################################################################################
#
Expand Down

0 comments on commit bf54ba6

Please sign in to comment.