CI: Fail early if PHP_FPM is set but not valid.

CI: Set PHP_FPM correctly for current Ubuntu images.

Github: closes #633

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933654 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index bfd770ea10a5b6947e1112a0442481a588bd5247..01a4310510d8529b99219bc69019717d8d9bfad8 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -22,7 +22,7 @@ env:
   MARGS: "-j2"
   CFLAGS: "-g"
   # This will need updating as the ubuntu-latest image changes:
-  PHP_FPM: "/usr/sbin/php-fpm8.1"
+  PHP_FPM: "/usr/sbin/php-fpm8.3"
 
 jobs:
   build:

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index d35f61cf6336b95a9a012aead26d64b234589c63..e85590b99b97031de3db0a3c82e56ff2418584b3 100755 (executable)
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -252,3 +252,8 @@ if test -v TEST_MOD_TLS -a -v RUSTLS_VERSION; then
         popd
     fi
 fi
+
+if test -v PHP_FPM -a ! -v SKIP_TESTING; then
+    # Sanity test the php-fpm executable exists.
+    $PHP_FPM --version || exit 1
+fi

diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 8d74f58d4834dc6b3854b28908198f52759e2440..67378192a33c0f88d9b929593882e4036b3d9674 100755 (executable)
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -128,11 +128,6 @@ if test -v TEST_ASAN; then
     export ASAN_OPTIONS="log_path=$PWD/asan.log:detect_leaks=0"
 fi
 
-if test -v PHP_FPM; then
-    # Sanity test the executable exists.
-    $PHP_FPM --version
-fi
-
 # Try to keep all potential coredumps from all processes
 sudo sysctl -w kernel.core_uses_pid=1 2>/dev/null || true
 # Systemd based systems might process core dumps via systemd-coredump.