summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-04-08 11:35:28 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-04-08 11:35:28 +0200
commit6a67067c21e18a6a613bdc61a70b1a62e0b9a8d2 (patch)
tree00700cb012d7c25f9b6bdd2cddfa0b4e75b51c7f
parentd4f9d54f1a1a312986e684c20114cd9f4faf5abb (diff)
parent73a0719f45782f843d2bd15ea22410390bc2de94 (diff)
downloadphp-git-6a67067c21e18a6a613bdc61a70b1a62e0b9a8d2.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Relax overly strict test expectation
-rw-r--r--sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt3
1 files changed, 1 insertions, 2 deletions
diff --git a/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt b/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
index c09e04b5a1..dbb02a00bd 100644
--- a/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
+++ b/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
@@ -78,8 +78,7 @@ function get_evt_name(int $evt) : ?string
--EXPECTF--
Started child %d
Running `tasklist /FI "PID eq %d" /NH` to check the process indeed exists:
-php.exe%w%d%s1%s
+php.exe%w%d%s
Sending CTRL+C to child %d
Successfully sent CTRL+C to child %d
Child %d exit with status 3 after %dus
-