From 9ecc0a4f296cf5c72572e75a9734b40d941e2427 Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Tue, 11 Jun 2019 12:53:34 +0200
Subject: [PATCH] use XFAILIF rather than XFAIL to avoid warnings [ci skip]

---
 sapi/phpdbg/tests/watch_001.phpt | 8 ++++++--
 sapi/phpdbg/tests/watch_002.phpt | 8 ++++++--
 sapi/phpdbg/tests/watch_003.phpt | 8 ++++++--
 sapi/phpdbg/tests/watch_004.phpt | 8 ++++++--
 sapi/phpdbg/tests/watch_005.phpt | 8 ++++++--
 sapi/phpdbg/tests/watch_006.phpt | 8 ++++++--
 6 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/sapi/phpdbg/tests/watch_001.phpt b/sapi/phpdbg/tests/watch_001.phpt
index 17e27da81a..05eb833128 100644
--- a/sapi/phpdbg/tests/watch_001.phpt
+++ b/sapi/phpdbg/tests/watch_001.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test simple recursive watchpoint
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE == 4) {
+    die("xfail There may be flaws in the implementation of watchpoints that cause failures")
+}
+?>
 --INI--
 opcache.optimization_level=0
 --PHPDBG--
@@ -45,5 +51,3 @@ $b = [$a];
 
 unset($b);
 $b = 2;
---XFAIL--
-There may be flaws in the implementation of watchpoints that cause failures
diff --git a/sapi/phpdbg/tests/watch_002.phpt b/sapi/phpdbg/tests/watch_002.phpt
index 5d977635b2..c0d9536e9d 100644
--- a/sapi/phpdbg/tests/watch_002.phpt
+++ b/sapi/phpdbg/tests/watch_002.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test simple array watchpoint with replace
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE == 4) {
+    die("xfail There may be flaws in the implementation of watchpoints that cause failures")
+}
+?>
 --PHPDBG--
 b 6
 r
@@ -30,5 +36,3 @@ $a[0] = 1;
 $a[0] = 2;
 
 $a = [0 => 3, 1 => 4];
---XFAIL--
-There may be flaws in the implementation of watchpoints that cause failures
diff --git a/sapi/phpdbg/tests/watch_003.phpt b/sapi/phpdbg/tests/watch_003.phpt
index 173d9b2e44..5bc560e749 100644
--- a/sapi/phpdbg/tests/watch_003.phpt
+++ b/sapi/phpdbg/tests/watch_003.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test simple watchpoint with replace
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE == 4) {
+    die("xfail There may be flaws in the implementation of watchpoints that cause failures")
+}
+?>
 --PHPDBG--
 b 6
 r
@@ -37,5 +43,3 @@ $a[0] = 1;
 $a[0] = 2;
 
 $a = [0 => 3, 1 => 4];
---XFAIL--
-There may be flaws in the implementation of watchpoints that cause failures
diff --git a/sapi/phpdbg/tests/watch_004.phpt b/sapi/phpdbg/tests/watch_004.phpt
index 2781fbe30a..e21c1dceb6 100644
--- a/sapi/phpdbg/tests/watch_004.phpt
+++ b/sapi/phpdbg/tests/watch_004.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test detection of inline string manipulations on zval watch
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE == 4) {
+    die("xfail There may be flaws in the implementation of watchpoints that cause failures")
+}
+?>
 --INI--
 opcache.optimization_level=0
 --PHPDBG--
@@ -36,5 +42,3 @@ prompt>
 $b = "a";
 $a = $b.$b;
 $a[1] = "b";
---XFAIL--
-There may be flaws in the implementation of watchpoints that cause failures
diff --git a/sapi/phpdbg/tests/watch_005.phpt b/sapi/phpdbg/tests/watch_005.phpt
index c36b519e79..7d479b5548 100644
--- a/sapi/phpdbg/tests/watch_005.phpt
+++ b/sapi/phpdbg/tests/watch_005.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test proper watch comparisons when having multiple levels of indirection from a zval to its value
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE == 4) {
+    die("xfail There may be flaws in the implementation of watchpoints that cause failures")
+}
+?>
 --PHPDBG--
 b 3
 r
@@ -46,5 +52,3 @@ $c = &$a;
 $a[1] = "b";
 
 exit;
---XFAIL--
-There may be flaws in the implementation of watchpoints that cause failures
diff --git a/sapi/phpdbg/tests/watch_006.phpt b/sapi/phpdbg/tests/watch_006.phpt
index bfcfca5fd2..f9a1f2c86c 100644
--- a/sapi/phpdbg/tests/watch_006.phpt
+++ b/sapi/phpdbg/tests/watch_006.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test multiple watch elements pointing to the same watchpoint
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE == 4) {
+    die("xfail There may be flaws in the implementation of watchpoints that cause failures")
+}
+?>
 --PHPDBG--
 b 4
 r
@@ -69,5 +75,3 @@ $a[0] = 2;
 $a[1] = 3;
 $c = [1];
 $b = &$c;
---XFAIL--
-There may be flaws in the implementation of watchpoints that cause failures
-- 
2.40.0