Mark several phpdbg tests as xfail

Apparently, breakpoints and watchpoints are practically disabled if
run with OPcache JIT under Windows, so we mark the affected tests as
xfail in that case for the time being.

diff --git a/sapi/phpdbg/tests/breakpoints_001.phpt b/sapi/phpdbg/tests/breakpoints_001.phpt
index 28f11760c815ada1d3459ce98fe9758e85f90943..4a13593d2531ceae37dcbebf9e1f281c5ba01416 100644 (file)
--- a/sapi/phpdbg/tests/breakpoints_001.phpt
+++ b/sapi/phpdbg/tests/breakpoints_001.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Fundamental breakpoints functionality
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
 --PHPDBG--
 b 3
 r

diff --git a/sapi/phpdbg/tests/breakpoints_002.phpt b/sapi/phpdbg/tests/breakpoints_002.phpt
index 93351321a875c7c1ab3dc6d66a57cec17db2681f..fe56256dd79adf56ad7bfbb34b3b791cbb361e9d 100644 (file)
--- a/sapi/phpdbg/tests/breakpoints_002.phpt
+++ b/sapi/phpdbg/tests/breakpoints_002.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Preserve breakpoints on restart
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
 --PHPDBG--
 b breakpoints_002.php:4
 r

diff --git a/sapi/phpdbg/tests/breakpoints_003.phpt b/sapi/phpdbg/tests/breakpoints_003.phpt
index 9a1f7cccc5bfd67a3bbf5dbd62a58b498253a1eb..0db228f384f80fa512109de4a1f4ddb6d5e596a9 100644 (file)
--- a/sapi/phpdbg/tests/breakpoints_003.phpt
+++ b/sapi/phpdbg/tests/breakpoints_003.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test deleting breakpoints
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
 --PHPDBG--
 b 4
 b del 0

diff --git a/sapi/phpdbg/tests/breakpoints_004.phpt b/sapi/phpdbg/tests/breakpoints_004.phpt
index 917e908efb4adb58ef853cf4dea7f164cda4f135..8141bf225201cf76038a52799f5feb22cff87dc4 100644 (file)
--- a/sapi/phpdbg/tests/breakpoints_004.phpt
+++ b/sapi/phpdbg/tests/breakpoints_004.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test opcode breakpoints
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
 --PHPDBG--
 b ZEND_ECHO
 r

diff --git a/sapi/phpdbg/tests/exceptions_003.phpt b/sapi/phpdbg/tests/exceptions_003.phpt
index ee68490df1afa440d556daa0d8d6bcd570e40e6c..d0f00b4ceb64b3aa2b3b8bf5e46036daf23f168f 100644 (file)
--- a/sapi/phpdbg/tests/exceptions_003.phpt
+++ b/sapi/phpdbg/tests/exceptions_003.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test breaks on HANDLE_EXCEPTION
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
 --PHPDBG--
 b 5
 r

diff --git a/sapi/phpdbg/tests/finish_leave_001.phpt b/sapi/phpdbg/tests/finish_leave_001.phpt
index cac771fd2f96326645d323931e8282d1b7cea30f..0597b3de0c915636f543d2b683da3e0bc8057b22 100644 (file)
--- a/sapi/phpdbg/tests/finish_leave_001.phpt
+++ b/sapi/phpdbg/tests/finish_leave_001.phpt
@@ -1,5 +1,11 @@
 --TEST--
 test finish and leave commands
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
 --INI--
 opcache.optimization_level=0
 --PHPDBG--

diff --git a/sapi/phpdbg/tests/info_002.phpt b/sapi/phpdbg/tests/info_002.phpt
index 8b1aa0930c9ae2dad1425bbfe9083f928e6700fa..e16737dcc2cf44a46b96acac6b08012093675f0d 100644 (file)
--- a/sapi/phpdbg/tests/info_002.phpt
+++ b/sapi/phpdbg/tests/info_002.phpt
@@ -1,5 +1,11 @@
 --TEST--
 info constants test
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
 --PHPDBG--
 b 10
 r

diff --git a/sapi/phpdbg/tests/next_001.phpt b/sapi/phpdbg/tests/next_001.phpt
index afc5133d253a8778601be24bb278897b4994e885..88f9ebd0184f39ad6b15d38f72cfe755f8c9a1e0 100644 (file)
--- a/sapi/phpdbg/tests/next_001.phpt
+++ b/sapi/phpdbg/tests/next_001.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test next command on function boundaries
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
 --PHPDBG--
 b 4
 r

diff --git a/sapi/phpdbg/tests/phpdbg_break_next.phpt b/sapi/phpdbg/tests/phpdbg_break_next.phpt
index 37ee2e8282e978148c72fb4ff88f0ec8f5e380fe..b129b6780ad6f0c6ae66ebeae98fdadc33b81f94 100644 (file)
--- a/sapi/phpdbg/tests/phpdbg_break_next.phpt
+++ b/sapi/phpdbg/tests/phpdbg_break_next.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test phpdbg_break_next() function
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
 --PHPDBG--
 r
 c

diff --git a/sapi/phpdbg/tests/run_002.phpt b/sapi/phpdbg/tests/run_002.phpt
index 02f6889d6da27b96b81af76e58252de254b4bb83..cffe42f27d537cfb38b007a14c4823664ab1927b 100644 (file)
--- a/sapi/phpdbg/tests/run_002.phpt
+++ b/sapi/phpdbg/tests/run_002.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Stdin and escaped args being passed to run command
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
 --CLEAN--
 <?php
 @unlink("run_002_tmp.fixture");

diff --git a/sapi/phpdbg/tests/set_exception_handler.phpt b/sapi/phpdbg/tests/set_exception_handler.phpt
index 7d4d4faca0945f23b6a17ca990e302003b6898f2..bc44a0d87e935173d76ac8c2211657e3245bbfe3 100644 (file)
--- a/sapi/phpdbg/tests/set_exception_handler.phpt
+++ b/sapi/phpdbg/tests/set_exception_handler.phpt
@@ -1,5 +1,11 @@
 --TEST--
 set_exception_handler() in phpdbg
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
+?>
 --PHPDBG--
 r
 c

diff --git a/sapi/phpdbg/tests/watch_001.phpt b/sapi/phpdbg/tests/watch_001.phpt
index 90ede3f9524ff52ea811b22a9a47c32f12e83c8a..2927496dece0bb7876dd50fda7a781f1c12e9e6a 100644 (file)
--- a/sapi/phpdbg/tests/watch_001.phpt
+++ b/sapi/phpdbg/tests/watch_001.phpt
@@ -5,6 +5,9 @@ Test simple recursive watchpoint
 if (PHP_INT_SIZE == 4) {
     die("xfail There may be flaws in the implementation of watchpoints that cause failures");
 }
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }

diff --git a/sapi/phpdbg/tests/watch_002.phpt b/sapi/phpdbg/tests/watch_002.phpt
index ba2cad1abee60cd9cde3a3a2fb86d48b6e35a1ca..b2b860959044c4101cdac2af999bdd108dca4dd5 100644 (file)
--- a/sapi/phpdbg/tests/watch_002.phpt
+++ b/sapi/phpdbg/tests/watch_002.phpt
@@ -5,6 +5,9 @@ Test simple array watchpoint with replace
 if (PHP_INT_SIZE == 4) {
     die("xfail There may be flaws in the implementation of watchpoints that cause failures");
 }
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }

diff --git a/sapi/phpdbg/tests/watch_003.phpt b/sapi/phpdbg/tests/watch_003.phpt
index ab6dc317a87b458d7e00866a35b23218e40b640e..dd75f3321f12d2c2060aa7b162b6713750c7c95b 100644 (file)
--- a/sapi/phpdbg/tests/watch_003.phpt
+++ b/sapi/phpdbg/tests/watch_003.phpt
@@ -5,6 +5,9 @@ Test simple watchpoint with replace
 if (PHP_INT_SIZE == 4) {
     die("xfail There may be flaws in the implementation of watchpoints that cause failures");
 }
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }

diff --git a/sapi/phpdbg/tests/watch_004.phpt b/sapi/phpdbg/tests/watch_004.phpt
index 42e3fd3b2686cd3e5b30e3bfcae9ee36b16f49bb..b04bea20b0bdbd96fb9085b3a586ed61bac776b7 100644 (file)
--- a/sapi/phpdbg/tests/watch_004.phpt
+++ b/sapi/phpdbg/tests/watch_004.phpt
@@ -5,6 +5,9 @@ Test detection of inline string manipulations on zval watch
 if (PHP_INT_SIZE == 4) {
     die("xfail There may be flaws in the implementation of watchpoints that cause failures");
 }
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }

diff --git a/sapi/phpdbg/tests/watch_005.phpt b/sapi/phpdbg/tests/watch_005.phpt
index aacc158f61740a501164a21bee3e9b78c70096ba..73b1e628a1e7b8cb1ab062c040839aed47019e43 100644 (file)
--- a/sapi/phpdbg/tests/watch_005.phpt
+++ b/sapi/phpdbg/tests/watch_005.phpt
@@ -5,6 +5,9 @@ Test proper watch comparisons when having multiple levels of indirection from a
 if (PHP_INT_SIZE == 4) {
     die("xfail There may be flaws in the implementation of watchpoints that cause failures");
 }
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }

diff --git a/sapi/phpdbg/tests/watch_006.phpt b/sapi/phpdbg/tests/watch_006.phpt
index 5b5ca9ee57c0e6e249e64c9e45b188813a340429..8fb2fc3e589743d204b4460e39276abeea554a8f 100644 (file)
--- a/sapi/phpdbg/tests/watch_006.phpt
+++ b/sapi/phpdbg/tests/watch_006.phpt
@@ -5,6 +5,9 @@ Test multiple watch elements pointing to the same watchpoint
 if (PHP_INT_SIZE == 4) {
     die("xfail There may be flaws in the implementation of watchpoints that cause failures");
 }
+if (PHP_OS_FAMILY === 'Windows' && ini_get('opcache.jit') && ini_get('opcache.jit_buffer_size')) {
+    die('xfail breakpoint/watchpoint issues with JIT on Windows');
+}
 if (getenv('SKIP_ASAN')) {
     die("skip intentionally causes segfaults");
 }