Skip to content
Permalink
Browse files

Update tests to use new SKIPIF helper methods (part 1)

  • Loading branch information...
derickr committed May 23, 2019
1 parent 34119be commit 32620c33263a564c806505014db349b0f8a869e8
Showing with 251 additions and 130 deletions.
  1. +4 −1 tests/assignment-trace1-php72-opcache.phpt
  2. +4 −1 tests/assignment-trace1.phpt
  3. +6 −3 tests/assignment-trace2-php72-opcache.phpt
  4. +4 −1 tests/assignment-trace2-php73-opcache.phpt
  5. +4 −1 tests/assignment-trace2.phpt
  6. +6 −2 tests/assignment-trace6-opcache.phpt
  7. +4 −1 tests/assignment-trace6-php72-opcache.phpt
  8. +4 −1 tests/assignment-trace6.phpt
  9. +4 −1 tests/assignment-trace7-php72-opcache.phpt
  10. +4 −1 tests/assignment-trace7.phpt
  11. +6 −3 tests/bug00213-php70-opcache.phpt
  12. +4 −2 tests/bug00213-php71-opcache.phpt
  13. +4 −3 tests/bug00334-php70-opcache.phpt
  14. +5 −3 tests/bug00334-php71-opcache.phpt
  15. +8 −3 tests/bug00567-php72-zts-opcache.phpt
  16. +4 −1 tests/bug00757b-php72.phpt
  17. +6 −3 tests/bug01034-001-php71-opcache.phpt
  18. +7 −4 tests/bug01034-001-php73-opcache.phpt
  19. +4 −3 tests/bug01034-003-php71-opcache.phpt
  20. +4 −4 tests/bug01034-005-php70-opcache.phpt
  21. +5 −5 tests/bug01034-005-php70.phpt
  22. +4 −3 tests/bug01034-005-php71-opcache.phpt
  23. +5 −4 tests/bug01034-005-php71.phpt
  24. +6 −2 tests/bug01034-005-php73-opcache.phpt
  25. +7 −3 tests/bug01034-005-php73.phpt
  26. +4 −3 tests/bug01210-php7214-opcache.phpt
  27. +4 −1 tests/bug01247-php72-opcache.phpt
  28. +4 −1 tests/bug01247.phpt
  29. +4 −2 tests/bug01270-php72-opcache.phpt
  30. +4 −3 tests/bug01386-php70-opcache.phpt
  31. +4 −2 tests/bug01386-php71-opcache.phpt
  32. +4 −3 tests/bug01420-php72-opcache.phpt
  33. +5 −2 tests/bug01486-001-php7214-opcache.phpt
  34. +4 −3 tests/bug01486-002-opcache.phpt
  35. +4 −2 tests/bug01509-php72-opcache.phpt
  36. +5 −2 tests/bug01530-opcache.phpt
  37. +4 −3 tests/coverage7-php71-opcache.phpt
  38. +4 −8 tests/get_declared_vars-php72-opcache.phpt
  39. +4 −2 tests/xdebug_debug_zval-php72-nts-opcache.phpt
  40. +8 −3 tests/xdebug_debug_zval-php72-zts-opcache.phpt
  41. +7 −3 tests/xdebug_debug_zval_cli_color-php70-nts.phpt
  42. +7 −3 tests/xdebug_debug_zval_cli_color-php70-zts.phpt
  43. +5 −4 tests/xdebug_debug_zval_cli_color-php71-nts-opcache.phpt
  44. +5 −3 tests/xdebug_debug_zval_cli_color-php71-nts.phpt
  45. +7 −4 tests/xdebug_debug_zval_cli_color-php71-zts-opcache.phpt
  46. +8 −4 tests/xdebug_debug_zval_cli_color-php71-zts.phpt
  47. +4 −2 tests/xdebug_debug_zval_cli_color-php72-nts-opcache.phpt
  48. +7 −3 tests/xdebug_debug_zval_cli_color-php72-zts-opcache.phpt
  49. +4 −2 tests/xdebug_debug_zval_stdout-php72-nts-opcache.phpt
  50. +8 −3 tests/xdebug_debug_zval_stdout-php72-zts-opcache.phpt
@@ -2,7 +2,10 @@
Test for tracing property assignments in user-readable function traces (>= PHP 7.2, opcache)
--SKIPIF--
<?php
if ( ! ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip >= PHP 7.2 && opcache loaded needed\n"; };
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '>=') && opcache_active() ) ) {
echo "skip >= PHP 7.2 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -2,7 +2,10 @@
Test for tracing property assignments in user-readable function traces (< PHP 7.2 || no opcache)
--SKIPIF--
<?php
if ( ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip < PHP 7.2 || !opcache loaded needed\n"; };
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '<') || !opcache_active() ) ) {
echo "skip < PHP 7.2 || !opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -1,9 +1,12 @@
--TEST--
Test for tracing array assignments in user-readable function traces (= PHP 7.2, opcache)
--SKIPIF--
<?php if (!version_compare(phpversion(), "7.2", '>=')) echo "skip = PHP 7.2 needed\n"; ?>
<?php if (!version_compare(phpversion(), "7.3", '<')) echo "skip = PHP 7.2 needed\n"; ?>
<?php if (!extension_loaded('zend opcache')) echo "skip opcache required\n"; ?>
<?php
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '>=') && runtime_version('7.3', '<') && opcache_active() ) ) {
echo "skip = PHP 7.2 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
xdebug.profiler_enable=0
@@ -2,7 +2,10 @@
Test for tracing array assignments in user-readable function traces (>= PHP 7.3.2, opcache)
--SKIPIF--
<?php
if ( ! ( version_compare(phpversion(), "7.3.2", '>=') && extension_loaded('zend opcache'))) { echo "skip >= PHP 7.3.2 && opcache loaded needed\n"; };
require 'tests/utils.inc';
if ( ! ( runtime_version('7.3.2', '>=') && opcache_active() ) ) {
echo "skip >= PHP 7.3.2 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -2,7 +2,10 @@
Test for tracing array assignments in user-readable function traces (< PHP 7.2 || no opcache)
--SKIPIF--
<?php
if ( ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip < PHP 7.2 || !opcache loaded needed\n"; };
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '<') || !opcache_active() ) ) {
echo "skip < PHP 7.2 || !opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -1,8 +1,12 @@
--TEST--
Test for tracing assignments in user-readable function traces (< PHP 7.2, opcache)
--SKIPIF--
<?php if (version_compare(phpversion(), "7.2", '>=')) echo "skip < PHP 7.2 && opcache loaded needed\n"; ?>
<?php if (!extension_loaded('zend opcache')) echo "skip opcache required\n"; ?>
<?php
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '<') && opcache_active() ) ) {
echo "skip < PHP 7.2 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
xdebug.profiler_enable=0
@@ -2,7 +2,10 @@
Test for tracing assignments in user-readable function traces (>= PHP 7.2, opcache)
--SKIPIF--
<?php
if ( ! ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip >= PHP 7.2 && opcache loaded needed\n"; };
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '>=') && opcache_active() ) ) {
echo "skip >= PHP 7.2 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -2,7 +2,10 @@
Test for tracing assignments in user-readable function traces (< PHP 7.2 || no opcache)
--SKIPIF--
<?php
if ( ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip < PHP 7.2 || !opcache loaded needed\n"; };
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '<') || !opcache_active() ) ) {
echo "skip < PHP 7.2 || !opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -2,7 +2,10 @@
Test for tracing property assignments in user-readable function traces (>= PHP 7.2, opcache)
--SKIPIF--
<?php
if ( ! ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip >= PHP 7.2 && opcache loaded needed\n"; };
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '>=') && opcache_active() ) ) {
echo "skip >= PHP 7.2 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -2,7 +2,10 @@
Test for tracing property assignments in user-readable function traces (< PHP 7.2 || no opcache)
--SKIPIF--
<?php
if ( ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip < PHP 7.2 || !opcache loaded needed\n"; };
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '<') || !opcache_active() ) ) {
echo "skip < PHP 7.2 || !opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -1,9 +1,12 @@
--TEST--
Test for bug #213: Dead code analysis doesn't take catches for throws into account (> PHP 7.0.12, < PHP 7.1, opcache)
--SKIPIF--
<?php if (!version_compare(phpversion(), "7.0.12", '>')) echo "skip > PHP 7.0.12, < PHP 7.1 needed\n"; ?>
<?php if (!version_compare(phpversion(), "7.1", '<')) echo "skip > PHP 7.0.12, < PHP 7.1 needed\n"; ?>
<?php if (!extension_loaded('zend opcache')) echo "skip opcache required\n"; ?>
<?php
require 'tests/utils.inc';
if ( ! ( runtime_version('7.0.12', '>') && runtime_version('7.1', '<') && opcache_active() ) ) {
echo "skip > PHP 7.0.12 && < PHP 7.1 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
xdebug.auto_trace=0
@@ -2,8 +2,10 @@
Test for bug #213: Dead code analysis doesn't take catches for throws into account (>= PHP 7.1, opcache)
--SKIPIF--
<?php
if (version_compare(phpversion(), "7.1", '<')) echo "skip >= PHP 7.1 needed\n";
if (!extension_loaded('zend opcache')) echo "skip opcache required\n";
require 'tests/utils.inc';
if ( ! ( runtime_version('7.1', '>=') && opcache_active() ) ) {
echo "skip >= PHP 7.1 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -2,9 +2,10 @@
Test for bug #334: Code Coverage Regressions (> PHP 7.0.12, < PHP 7.1, opcache)
--SKIPIF--
<?php
if (!version_compare(phpversion(), "7.0.12", '>')) echo "skip > PHP 7.0.12, < PHP 7.1 needed\n";
if (!version_compare(phpversion(), "7.1", '<')) echo "skip > PHP 7.0.12, < PHP 7.1 needed\n";
if (!extension_loaded('zend opcache')) echo "skip opcache required\n";
require 'tests/utils.inc';
if ( ! ( runtime_version('7.0.12', '>') && runtime_version('7.1', '<') && opcache_active() ) ) {
echo "skip > PHP 7.0.12 && < PHP 7.1 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -1,9 +1,11 @@
--TEST--
Test for bug #334: Code Coverage Regressions (>= PHP 7.1)
Test for bug #334: Code Coverage Regressions (>= PHP 7.1, opcache)
--SKIPIF--
<?php
if (version_compare(phpversion(), "7.1", '<')) echo "skip >= PHP 7.1 needed\n";
if (!extension_loaded('zend opcache')) echo "skip opcache required\n";
require 'tests/utils.inc';
if ( ! ( runtime_version('7.1', '>=') && opcache_active() ) ) {
echo "skip >= PHP 7.1 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -1,9 +1,14 @@
--TEST--
Test for bug #567: xdebug_debug_zval() and xdebug_debug_zval_stdout() don't work (>= PHP 7.2, ZTS, opcache)
--SKIPIF--
<?php if (PHP_ZTS == 0) echo "skip ZTS needed\n"; ?>
<?php if (!version_compare(phpversion(), "7.2", '>=')) echo "skip >= PHP 7.2 needed\n"; ?>
<?php if (!extension_loaded('zend opcache')) echo "skip opcache required\n"; ?>
<?php
require 'tests/utils.inc';
if (PHP_ZTS == 0) echo "skip ZTS needed\n";
if ( ! ( runtime_version('7.2', '>=') && opcache_active() ) ) {
echo "skip >= PHP 7.2 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
xdebug.overload_var_dump=2
@@ -2,7 +2,10 @@
Test for bug #757: XDEBUG_CC_UNUSED does not work with code outside a function (>= PHP 7.2 && opcache)
--SKIPIF--
<?php
if ( ! ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip >= PHP 7.2 && opcache loaded needed\n"; };
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '>=') && opcache_active() ) ) {
echo "skip >= PHP 7.2 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -1,9 +1,12 @@
--TEST--
Test for bug #1034: path coverage [1] (> PHP 7.1, < PHP 7.3, opcache)
--SKIPIF--
<?php if (!version_compare(phpversion(), "7.1", '>')) echo "skip > PHP 7.1, < PHP 7.3 needed\n"; ?>
<?php if (!version_compare(phpversion(), "7.3", '<')) echo "skip > PHP 7.1, < PHP 7.3 needed\n"; ?>
<?php if (!extension_loaded('zend opcache')) echo "skip opcache required\n"; ?>
<?php
require 'tests/utils.inc';
if ( ! ( runtime_version('7.1', '>') && runtime_version('7.3', '<') && opcache_active() ) ) {
echo "skip > PHP 7.1 && < PHP 7.3 && opcache loaded needed\n";
}
?>
--FILE--
<?php
include 'dump-branch-coverage.inc';
@@ -1,9 +1,12 @@
--TEST--
Test for bug #1034: path coverage [1] (> PHP 7.1, < PHP 7.3, opcache)
Test for bug #1034: path coverage [1] (>= PHP 7.3, opcache)
--SKIPIF--
<?php if (!version_compare(phpversion(), "7.1", '>')) echo "skip > PHP 7.1, < PHP 7.3 needed\n"; ?>
<?php if (!version_compare(phpversion(), "7.3", '<')) echo "skip > PHP 7.1, < PHP 7.3 needed\n"; ?>
<?php if (!extension_loaded('zend opcache')) echo "skip opcache required\n"; ?>
<?php
require 'tests/utils.inc';
if ( ! ( runtime_version('7.3', '>=') && opcache_active() ) ) {
echo "skip >= PHP 7.3 && opcache loaded needed\n";
}
?>
--FILE--
<?php
include 'dump-branch-coverage.inc';
@@ -2,9 +2,10 @@
Test for bug #1034: path coverage [3] (> PHP 7.1, < PHP 7.3, opcache)
--SKIPIF--
<?php
if (version_compare(phpversion(), "7.1", '<')) echo "skip >= PHP 7.1, < PHP 7.3 needed\n";
if (version_compare(phpversion(), "7.3", '>=')) echo "skip >= PHP 7.1, < PHP 7.3 needed\n";
if (!extension_loaded('zend opcache')) echo "skip opcache required\n";
require 'tests/utils.inc';
if ( ! ( runtime_version('7.1', '>') && runtime_version('7.3', '<') && opcache_active() ) ) {
echo "skip > PHP 7.1 && < PHP 7.3 && opcache loaded needed\n";
}
?>
--FILE--
<?php
@@ -2,10 +2,10 @@
Test for bug #1034: path coverage [5] (>= PHP 7.0, <= PHP 7.0.12, opcache)
--SKIPIF--
<?php
if (!version_compare(phpversion(), "7.0", '>=')) echo "skip >= PHP 7.0, <= PHP 7.0.12\n";
if (version_compare(phpversion(), "7.0.12", '>')) echo "skip >= PHP 7.0, <= PHP 7.0.12\n";
if (!extension_loaded('zend opcache')) echo "skip opcache required\n";
?>
require 'tests/utils.inc';
if ( ! ( runtime_version('7.0', '>=') && runtime_version('7.0.12', '<=') && opcache_active() ) ) {
echo "skip >= PHP 7.0 && <= PHP 7.0.12 && opcache loaded needed\n";
}
?>
--FILE--
<?php
@@ -1,11 +1,11 @@
--TEST--
Test for bug #1034: path coverage [5] (>= PHP 7.0, <= PHP 7.0.12)
Test for bug #1034: path coverage [5] (>= PHP 7.0, <= PHP 7.0.12, !opcache)
--SKIPIF--
<?php
if (!version_compare(phpversion(), "7.0", '>=')) echo "skip >= PHP 7.0, <= PHP 7.0.12\n";
if (version_compare(phpversion(), "7.0.12", '>')) echo "skip >= PHP 7.0, <= PHP 7.0.12\n";
if (extension_loaded('zend opcache')) echo "skip opcache should not be loaded\n";
?>
require 'tests/utils.inc';
if ( ! ( runtime_version('7.0', '>=') && runtime_version('7.0.12', '<=') && !opcache_active() ) ) {
echo "skip >= PHP 7.0 && <= PHP 7.0.12 && opcache not loaded needed\n";
}
?>
--FILE--
<?php
@@ -2,9 +2,10 @@
Test for bug #1034: path coverage [5] (> PHP 7.0.12, < PHP 7.3, opcache)
--SKIPIF--
<?php
if (!version_compare(phpversion(), "7.0.12", '>')) echo "skip > PHP 7.0.12, < PHP 7.3 needed\n";
if (!version_compare(phpversion(), "7.3", '<')) echo "skip > PHP 7.0.12, < PHP 7.3 needed\n";
if (!extension_loaded('zend opcache')) echo "skip opcache required\n";
require 'tests/utils.inc';
if ( ! ( runtime_version('7.0.12', '>') && runtime_version('7.3', '<') && opcache_active() ) ) {
echo "skip > PHP 7.0.12 && < PHP 7.3 && opcache loaded needed\n";
}
?>
--FILE--
<?php
@@ -1,10 +1,11 @@
--TEST--
Test for bug #1034: path coverage [5] (> PHP 7.0.12, < PHP 7.3)
Test for bug #1034: path coverage [5] (> PHP 7.0.12, < PHP 7.3, !opcache)
--SKIPIF--
<?php
if (!version_compare(phpversion(), "7.0.12", '>')) echo "skip > PHP 7.0.12, < PHP 7.3 needed\n";
if (!version_compare(phpversion(), "7.3", '<')) echo "skip > PHP 7.0.12, < PHP 7.3 needed\n";
if (extension_loaded('zend opcache')) echo "skip opcache should not be loaded\n";
require 'tests/utils.inc';
if ( ! ( runtime_version('7.0.12', '>') && runtime_version('7.3', '<') && !opcache_active() ) ) {
echo "skip > PHP 7.0.12 && < PHP 7.3 && opcache not loaded needed\n";
}
?>
--FILE--
<?php
@@ -1,8 +1,12 @@
--TEST--
Test for bug #1034: path coverage [5] (>= PHP 7.3, opcache)
--SKIPIF--
<?php if (!version_compare(phpversion(), "7.3", '>=')) echo "skip >= PHP 7.3\n"; ?>
<?php if (!extension_loaded('zend opcache')) echo "skip opcache required\n"; ?>
<?php
require 'tests/utils.inc';
if ( ! ( runtime_version('7.3', '>=') && opcache_active() ) ) {
echo "skip >= PHP 7.3 && opcache loaded needed\n";
}
?>
--FILE--
<?php
include 'dump-branch-coverage.inc';
@@ -1,8 +1,12 @@
--TEST--
Test for bug #1034: path coverage [5] (>= PHP 7.3)
Test for bug #1034: path coverage [5] (>= PHP 7.3, !opcache)
--SKIPIF--
<?php if (!version_compare(phpversion(), "7.3", '>=')) echo "skip >= PHP 7.3\n"; ?>
<?php if (extension_loaded('zend opcache')) echo "skip opcache should not be loaded\n"; ?>
<?php
require 'tests/utils.inc';
if ( ! ( runtime_version('7.3', '>=') && !opcache_active() ) ) {
echo "skip >= PHP 7.3 && opcache not loaded needed\n";
}
?>
--FILE--
<?php
include 'dump-branch-coverage.inc';
@@ -2,9 +2,10 @@
Test for bug #1210: Coverage of sending arguments to a method (> PHP 7.2.13, opcache)
--SKIPIF--
<?php
if (!version_compare(phpversion(), "7.2.13", '>')) echo "skip > PHP 7.2.13 needed\n";
if (version_compare(phpversion(), "7.3.0", '==')) echo "skip PHP 7.3.0 is not supported in this test\n";
if (!extension_loaded('zend opcache')) echo "skip opcache required\n";
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2.13', '>') && opcache_active() ) ) {
echo "skip > PHP 7.2.13 && opcache loaded needed\n";
}
?>
--FILE--
<?php
@@ -2,7 +2,10 @@
Test for bug #1247: xdebug.show_local_vars dumps variables with *uninitialized* values (>= PHP 7.2 && opcache)
--SKIPIF--
<?php
if ( ! ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip >= PHP 7.2 && opcache loaded needed\n"; };
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '>=') && opcache_active() ) ) {
echo "skip >= PHP 7.2 && opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1
@@ -2,7 +2,10 @@
Test for bug #1247: xdebug.show_local_vars dumps variables with *uninitialized* values (< PHP 7.2 || no opcache)
--SKIPIF--
<?php
if ( ( version_compare(phpversion(), "7.2", '>=') && extension_loaded('zend opcache'))) { echo "skip >= PHP 7.2 && opcache loaded needed\n"; };
require 'tests/utils.inc';
if ( ! ( runtime_version('7.2', '<') || !opcache_active() ) ) {
echo "skip < PHP 7.2 || !opcache loaded needed\n";
}
?>
--INI--
xdebug.default_enable=1

0 comments on commit 32620c3

Please sign in to comment.
You can’t perform that action at this time.