Merge pull request 'tests: fix SC2034 + pipefail hazard in lsphp-src-upload-progress test' (#47) from fix/shellcheck-upload-progress-test into trunk

[skip ci] Fix shellcheck SC2034 and pipefail SIGPIPE pattern in lsphp upload-progress test
This commit was merged in pull request #47.
This commit is contained in:
jknapp committed 2026-11-19 20:13:37 +00:00
commit 935b02eae4
1 file changed
+9 -2
@@ -15,9 +15,16 @@ cat >"$T/session.c" <<'EOT'
"0", ZEND_INI_PERDIR, OnUpdateBool, rfc1867_cleanup, php_ps_globals, ps_globals) "0", ZEND_INI_PERDIR, OnUpdateBool, rfc1867_cleanup, php_ps_globals, ps_globals)
EOT EOT
## Run the exact sed expression from the script. ## Run the exact sed expression from the script.
SEDLINE=$(grep -F "session\\.upload_progress\\.enabled" "$S" | grep '^ *sed -i' | head -n1) ## Plain loop, not a grep|grep|head pipeline: an early-exit reader under pipefail
## can SIGPIPE its writer (see lsphp-info-probe.test.sh structural scan).
SEDLINE=""
while IFS= read -r line; do
case "$line" in *'session\.upload_progress\.enabled'*) ;; *) continue ;; esac
case "$line" in ' '*'sed -i'*|'sed -i'*) SEDLINE="$line"; break ;; esac
done <"$S"
[ -n "$SEDLINE" ] || { echo "FAIL: sed line not found in script"; exit 1; } [ -n "$SEDLINE" ] || { echo "FAIL: sed line not found in script"; exit 1; }
SRC="$T"; sed() { command sed "$@"; } export SRC="$T" # referenced by the eval'd sed line
sed() { command sed "$@"; }
eval "${SEDLINE//\$SRC\/ext\/session\/session.c/$T/session.c}" eval "${SEDLINE//\$SRC\/ext\/session\/session.c/$T/session.c}"
chk "enabled flipped to 1" "$(grep -A1 'upload_progress.enabled' "$T/session.c" | grep -c '"1"')" 1 chk "enabled flipped to 1" "$(grep -A1 'upload_progress.enabled' "$T/session.c" | grep -c '"1"')" 1
chk "cleanup untouched" "$(grep -A1 'upload_progress.cleanup' "$T/session.c" | grep -c '"0"')" 1 chk "cleanup untouched" "$(grep -A1 'upload_progress.cleanup' "$T/session.c" | grep -c '"0"')" 1