summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-11-30 15:24:44 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2020-11-30 15:24:44 +0100
commit875741b1cf3e50f0c256b47644fc2ce67781a7b5 (patch)
tree863145845650531f8763a26473c979b1cc8f67db /sapi
parent4ce33486d7739cc6fd410eca8f524981fc22aad5 (diff)
parent57463cf78b0fac09c50fabe66143e6e41c6c46be (diff)
downloadphp-git-875741b1cf3e50f0c256b47644fc2ce67781a7b5.tar.gz
Merge branch 'PHP-8.0'
* PHP-8.0: Drop all JIT related XFAILS from phpdbg test suite
Diffstat (limited to 'sapi')
-rw-r--r--sapi/phpdbg/tests/breakpoints_001.phpt6
-rw-r--r--sapi/phpdbg/tests/breakpoints_002.phpt6
-rw-r--r--sapi/phpdbg/tests/breakpoints_003.phpt6
-rw-r--r--sapi/phpdbg/tests/breakpoints_004.phpt6
-rw-r--r--sapi/phpdbg/tests/bug73927.phpt3
-rw-r--r--sapi/phpdbg/tests/exceptions_003.phpt6
-rw-r--r--sapi/phpdbg/tests/finish_leave_001.phpt6
-rw-r--r--sapi/phpdbg/tests/info_002.phpt6
-rw-r--r--sapi/phpdbg/tests/next_001.phpt6
-rw-r--r--sapi/phpdbg/tests/phpdbg_break_next.phpt6
-rw-r--r--sapi/phpdbg/tests/phpdbg_get_executable_stream_wrapper.phpt6
-rw-r--r--sapi/phpdbg/tests/run_002.phpt6
-rw-r--r--sapi/phpdbg/tests/set_exception_handler.phpt6
-rw-r--r--sapi/phpdbg/tests/watch_001.phpt3
-rw-r--r--sapi/phpdbg/tests/watch_002.phpt3
-rw-r--r--sapi/phpdbg/tests/watch_003.phpt3
-rw-r--r--sapi/phpdbg/tests/watch_004.phpt3
-rw-r--r--sapi/phpdbg/tests/watch_005.phpt3
-rw-r--r--sapi/phpdbg/tests/watch_006.phpt3
19 files changed, 0 insertions, 93 deletions
diff --git a/sapi/phpdbg/tests/breakpoints_001.phpt b/sapi/phpdbg/tests/breakpoints_001.phpt
index 4a13593d25..28f11760c8 100644
--- a/sapi/phpdbg/tests/breakpoints_001.phpt
+++ b/sapi/phpdbg/tests/breakpoints_001.phpt
@@ -1,11 +1,5 @@
--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 fe56256dd7..93351321a8 100644
--- a/sapi/phpdbg/tests/breakpoints_002.phpt
+++ b/sapi/phpdbg/tests/breakpoints_002.phpt
@@ -1,11 +1,5 @@
--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 0db228f384..9a1f7cccc5 100644
--- a/sapi/phpdbg/tests/breakpoints_003.phpt
+++ b/sapi/phpdbg/tests/breakpoints_003.phpt
@@ -1,11 +1,5 @@
--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 8141bf2252..917e908efb 100644
--- a/sapi/phpdbg/tests/breakpoints_004.phpt
+++ b/sapi/phpdbg/tests/breakpoints_004.phpt
@@ -1,11 +1,5 @@
--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/bug73927.phpt b/sapi/phpdbg/tests/bug73927.phpt
index 9f1cc684fa..bb54f4e176 100644
--- a/sapi/phpdbg/tests/bug73927.phpt
+++ b/sapi/phpdbg/tests/bug73927.phpt
@@ -5,9 +5,6 @@ Bug #73927 (phpdbg fails with windows error prompt at "watch array")
if (getenv('SKIP_ASAN')) {
die("skip intentionally causes segfaults");
}
-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 19
diff --git a/sapi/phpdbg/tests/exceptions_003.phpt b/sapi/phpdbg/tests/exceptions_003.phpt
index d0f00b4ceb..ee68490df1 100644
--- a/sapi/phpdbg/tests/exceptions_003.phpt
+++ b/sapi/phpdbg/tests/exceptions_003.phpt
@@ -1,11 +1,5 @@
--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 0597b3de0c..cac771fd2f 100644
--- a/sapi/phpdbg/tests/finish_leave_001.phpt
+++ b/sapi/phpdbg/tests/finish_leave_001.phpt
@@ -1,11 +1,5 @@
--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 e16737dcc2..8b1aa0930c 100644
--- a/sapi/phpdbg/tests/info_002.phpt
+++ b/sapi/phpdbg/tests/info_002.phpt
@@ -1,11 +1,5 @@
--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 88f9ebd018..afc5133d25 100644
--- a/sapi/phpdbg/tests/next_001.phpt
+++ b/sapi/phpdbg/tests/next_001.phpt
@@ -1,11 +1,5 @@
--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 b129b6780a..37ee2e8282 100644
--- a/sapi/phpdbg/tests/phpdbg_break_next.phpt
+++ b/sapi/phpdbg/tests/phpdbg_break_next.phpt
@@ -1,11 +1,5 @@
--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/phpdbg_get_executable_stream_wrapper.phpt b/sapi/phpdbg/tests/phpdbg_get_executable_stream_wrapper.phpt
index 21ac6a4919..ab6236a7fc 100644
--- a/sapi/phpdbg/tests/phpdbg_get_executable_stream_wrapper.phpt
+++ b/sapi/phpdbg/tests/phpdbg_get_executable_stream_wrapper.phpt
@@ -1,11 +1,5 @@
--TEST--
Getting executable lines from custom wrappers
---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
q
diff --git a/sapi/phpdbg/tests/run_002.phpt b/sapi/phpdbg/tests/run_002.phpt
index cffe42f27d..02f6889d6d 100644
--- a/sapi/phpdbg/tests/run_002.phpt
+++ b/sapi/phpdbg/tests/run_002.phpt
@@ -1,11 +1,5 @@
--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 bc44a0d87e..7d4d4faca0 100644
--- a/sapi/phpdbg/tests/set_exception_handler.phpt
+++ b/sapi/phpdbg/tests/set_exception_handler.phpt
@@ -1,11 +1,5 @@
--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 2927496dec..90ede3f952 100644
--- a/sapi/phpdbg/tests/watch_001.phpt
+++ b/sapi/phpdbg/tests/watch_001.phpt
@@ -5,9 +5,6 @@ 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 b2b8609590..ba2cad1abe 100644
--- a/sapi/phpdbg/tests/watch_002.phpt
+++ b/sapi/phpdbg/tests/watch_002.phpt
@@ -5,9 +5,6 @@ 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 dd75f3321f..ab6dc317a8 100644
--- a/sapi/phpdbg/tests/watch_003.phpt
+++ b/sapi/phpdbg/tests/watch_003.phpt
@@ -5,9 +5,6 @@ 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 b04bea20b0..42e3fd3b26 100644
--- a/sapi/phpdbg/tests/watch_004.phpt
+++ b/sapi/phpdbg/tests/watch_004.phpt
@@ -5,9 +5,6 @@ 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 73b1e628a1..aacc158f61 100644
--- a/sapi/phpdbg/tests/watch_005.phpt
+++ b/sapi/phpdbg/tests/watch_005.phpt
@@ -5,9 +5,6 @@ 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 8fb2fc3e58..5b5ca9ee57 100644
--- a/sapi/phpdbg/tests/watch_006.phpt
+++ b/sapi/phpdbg/tests/watch_006.phpt
@@ -5,9 +5,6 @@ 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");
}