From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 14 Mar 2017 11:06:58 +0000 (+0100)
Subject: Fix SKIPIF conditions
X-Git-Tag: php-7.2.0alpha1~268
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16ae9f82e82e2aea5d7deaf8f9a9c825a56dfcc1;p=php

Fix SKIPIF conditions
---

diff --git a/Zend/tests/overloaded_func_001.phpt b/Zend/tests/overloaded_func_001.phpt
index 2702772a46..0b7360e8f9 100644
--- a/Zend/tests/overloaded_func_001.phpt
+++ b/Zend/tests/overloaded_func_001.phpt
@@ -2,7 +2,7 @@
 Overloaded function 001
 --SKIPIF--
 <?php
-if (!PHP_DEBUG) die("skip only run in debug version");
+if (!class_exists('_ZendTestClass')) die("skip needs class with overloaded function");
 ?>
 --FILE--
 <?php
diff --git a/Zend/tests/overloaded_func_002.phpt b/Zend/tests/overloaded_func_002.phpt
index 6c16965919..2762f41840 100644
--- a/Zend/tests/overloaded_func_002.phpt
+++ b/Zend/tests/overloaded_func_002.phpt
@@ -2,7 +2,7 @@
 Overloaded function 002
 --SKIPIF--
 <?php
-if (!PHP_DEBUG) die("skip only run in debug version");
+if (!class_exists('_ZendTestClass')) die("skip needs class with overloaded function");
 ?>
 --FILE--
 <?php
diff --git a/Zend/tests/traits/bug69579.phpt b/Zend/tests/traits/bug69579.phpt
index 421734e74e..009bddadca 100644
--- a/Zend/tests/traits/bug69579.phpt
+++ b/Zend/tests/traits/bug69579.phpt
@@ -2,7 +2,7 @@
 Bug #69579 (Internal trait double-free)
 --SKIPIF--
 <?php
-if (!PHP_DEBUG) die("skip only run in debug version");
+if (!trait_exists('_ZendTestTrait')) die("skip requires internal trait");
 ?>
 --FILE--
 <?php