summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-07-01 18:12:28 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2019-07-01 18:12:28 +0200
commit3e25ddb07bbe5738b37c761ccba72cb4bf77cc16 (patch)
treec468ec72c986511c822eeaf4e08863975a293946
parent99e6c701e6ddde0697ee7ff3e1f3b8247dee3b9c (diff)
parent57688ad7bff7e769078d1e670a65853635d31a71 (diff)
downloadphp-git-3e25ddb07bbe5738b37c761ccba72cb4bf77cc16.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Add missing SKIPIFs
-rw-r--r--ext/opcache/tests/bug75729.phpt1
-rw-r--r--ext/opcache/tests/bug76337.phpt1
-rw-r--r--ext/opcache/tests/bug77257.phpt2
-rw-r--r--ext/opcache/tests/bug77275.phpt2
-rw-r--r--ext/opcache/tests/bug77310_1.phpt2
-rw-r--r--ext/opcache/tests/bug78015.phpt2
-rw-r--r--ext/opcache/tests/invalid_new_dce.phpt2
-rw-r--r--ext/opcache/tests/jmp_elim_004.phpt2
-rw-r--r--ext/opcache/tests/ssa_bug_011.phpt2
9 files changed, 16 insertions, 0 deletions
diff --git a/ext/opcache/tests/bug75729.phpt b/ext/opcache/tests/bug75729.phpt
index 81d8f4264b..52b004c75a 100644
--- a/ext/opcache/tests/bug75729.phpt
+++ b/ext/opcache/tests/bug75729.phpt
@@ -1,6 +1,7 @@
--TEST--
Bug #75729: opcache segfault when installing Bitrix
--SKIPIF--
+<?php require_once('skipif.inc'); ?>
<?php if (!extension_loaded('mbstring')) die('skip mbstring not loaded'); ?>
--INI--
opcache.enable_cli=1
diff --git a/ext/opcache/tests/bug76337.phpt b/ext/opcache/tests/bug76337.phpt
index fe3fd8d40e..5001942526 100644
--- a/ext/opcache/tests/bug76337.phpt
+++ b/ext/opcache/tests/bug76337.phpt
@@ -1,6 +1,7 @@
--TEST--
Bug 76337: segmentation fault when an extension use zend_register_class_alias() and opcache enabled
--SKIPIF--
+<?php require_once('skipif.inc'); ?>
<?php if (!extension_loaded('zend-test')) die('skip zend-test extension not loaded');
--INI--
opcache.enable=1
diff --git a/ext/opcache/tests/bug77257.phpt b/ext/opcache/tests/bug77257.phpt
index 4786a9f3c0..ef2e17feb4 100644
--- a/ext/opcache/tests/bug77257.phpt
+++ b/ext/opcache/tests/bug77257.phpt
@@ -1,5 +1,7 @@
--TEST--
Bug #77257: value of variable assigned in a switch() construct gets lost
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
function test($x) {
diff --git a/ext/opcache/tests/bug77275.phpt b/ext/opcache/tests/bug77275.phpt
index 28f6a3036f..d482f9e720 100644
--- a/ext/opcache/tests/bug77275.phpt
+++ b/ext/opcache/tests/bug77275.phpt
@@ -3,6 +3,8 @@ Bug #77275: OPcache optimization problem for ArrayAccess->offsetGet(string)
--INI--
opcache.enable_cli=1
opcache.optimization_level=-1
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
namespace Foo;
diff --git a/ext/opcache/tests/bug77310_1.phpt b/ext/opcache/tests/bug77310_1.phpt
index f7baec7fb8..a9af4bffba 100644
--- a/ext/opcache/tests/bug77310_1.phpt
+++ b/ext/opcache/tests/bug77310_1.phpt
@@ -1,5 +1,7 @@
--TEST--
Bug #77310 (1): Incorrect SCCP for compound assign to arrays
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
diff --git a/ext/opcache/tests/bug78015.phpt b/ext/opcache/tests/bug78015.phpt
index b2ecceacde..0a03c9834f 100644
--- a/ext/opcache/tests/bug78015.phpt
+++ b/ext/opcache/tests/bug78015.phpt
@@ -1,5 +1,7 @@
--TEST--
Bug #78015: Incorrect evaluation of expressions involving partials array in SCCP
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
diff --git a/ext/opcache/tests/invalid_new_dce.phpt b/ext/opcache/tests/invalid_new_dce.phpt
index 8f44b80f10..c029a49bdc 100644
--- a/ext/opcache/tests/invalid_new_dce.phpt
+++ b/ext/opcache/tests/invalid_new_dce.phpt
@@ -3,6 +3,8 @@ Throwings NEWs should not be DCEd
--INI--
opcache.enable_cli=1
opcache.optimization_level=-1
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
diff --git a/ext/opcache/tests/jmp_elim_004.phpt b/ext/opcache/tests/jmp_elim_004.phpt
index f4053d9616..8834ab4e85 100644
--- a/ext/opcache/tests/jmp_elim_004.phpt
+++ b/ext/opcache/tests/jmp_elim_004.phpt
@@ -3,6 +3,8 @@ Incorrect empty basic block elimination
--INI--
opcache.enable_cli=1
opcache.optimization_level=-1
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
diff --git a/ext/opcache/tests/ssa_bug_011.phpt b/ext/opcache/tests/ssa_bug_011.phpt
index 3c12777724..c25e9c46ab 100644
--- a/ext/opcache/tests/ssa_bug_011.phpt
+++ b/ext/opcache/tests/ssa_bug_011.phpt
@@ -1,5 +1,7 @@
--TEST--
Wrong assertion
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
function foo($transitions) {