From 17ed2f21cfcf25f3c992b359c672171159d3516c Mon Sep 17 00:00:00 2001
From: atvoicu <avoicu@google.com>
Date: Wed, 21 Mar 2018 14:45:14 -0700
Subject: [PATCH] Add missing skip prefix for some SKIPIF messages

---
 Zend/tests/bug43450.phpt                              | 2 +-
 ext/ftp/tests/ftp_nb_get_large.phpt                   | 2 +-
 ext/mysqli/tests/014.phpt                             | 6 +++---
 ext/mysqli/tests/bug69899.phpt                        | 2 +-
 ext/snmp/tests/snmp_read_mib.phpt                     | 2 +-
 ext/sockets/tests/bug63000.phpt                       | 2 +-
 ext/standard/tests/file/bug60120.phpt                 | 2 +-
 ext/standard/tests/file/windows_links/bug48746.phpt   | 2 +-
 ext/standard/tests/file/windows_links/bug48746_1.phpt | 2 +-
 ext/standard/tests/filters/chunked_001.phpt           | 2 +-
 ext/standard/tests/strings/bug72434.phpt              | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Zend/tests/bug43450.phpt b/Zend/tests/bug43450.phpt
index f0cd4f75bc..9f6c5f8504 100644
--- a/Zend/tests/bug43450.phpt
+++ b/Zend/tests/bug43450.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #43450 (Memory leak on some functions with implicit object __toString() call)
 --SKIPIF--
-<?php if (!function_exists('memory_get_usage')) die('memory_get_usage() not installed'); ?>
+<?php if (!function_exists('memory_get_usage')) die('skip memory_get_usage() not installed'); ?>
 --INI--
 opcache.enable_cli=0
 --FILE--
diff --git a/ext/ftp/tests/ftp_nb_get_large.phpt b/ext/ftp/tests/ftp_nb_get_large.phpt
index 0c354d7c19..4ac5fa37f1 100644
--- a/ext/ftp/tests/ftp_nb_get_large.phpt
+++ b/ext/ftp/tests/ftp_nb_get_large.phpt
@@ -7,7 +7,7 @@ if (2147483647 == PHP_INT_MAX) {
     die('skip ot supported on this system');
 }
 if (disk_free_space(__DIR__) < 10*1024*1024*1024) {
-    die('not enough disk space');
+    die('skip Not enough disk space');
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt
index 30044dc4fb..59425ac9d0 100644
--- a/ext/mysqli/tests/014.phpt
+++ b/ext/mysqli/tests/014.phpt
@@ -8,10 +8,10 @@ mysqli autocommit/commit/rollback
 
 	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 	if (!$link)
-		die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+		die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 	if (!have_innodb($link))
-		die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+		die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -94,4 +94,4 @@ array(2) {
   [1]=>
   string(4) "egon"
 }
-done!
\ No newline at end of file
+done!
diff --git a/ext/mysqli/tests/bug69899.phpt b/ext/mysqli/tests/bug69899.phpt
index 177b5e3dce..6859b91c13 100644
--- a/ext/mysqli/tests/bug69899.phpt
+++ b/ext/mysqli/tests/bug69899.phpt
@@ -12,7 +12,7 @@ require_once __DIR__ . '/skipif.inc';
 require_once __DIR__ . '/skipifconnectfailure.inc';
 require_once __DIR__ . '/connect.inc';
 if (!$IS_MYSQLND) {
-	die('mysqlnd only');
+	die('skip mysqlnd only');
 }
 ?>
 --FILE--
diff --git a/ext/snmp/tests/snmp_read_mib.phpt b/ext/snmp/tests/snmp_read_mib.phpt
index b26ba5e52a..9a6d3b5e5b 100644
--- a/ext/snmp/tests/snmp_read_mib.phpt
+++ b/ext/snmp/tests/snmp_read_mib.phpt
@@ -7,7 +7,7 @@ Olivier Doucet Olivier Doucet Boris Lytochkin
 require_once(dirname(__FILE__).'/skipif.inc');
 require_once(dirname(__FILE__).'/snmp_include.inc');
 
-if (!file_exists($mibdir . '/SNMPv2-MIB.txt')) die('MIB file not in the system');
+if (!file_exists($mibdir . '/SNMPv2-MIB.txt')) die('skip MIB file not in the system');
 
 ?>
 --FILE--
diff --git a/ext/sockets/tests/bug63000.phpt b/ext/sockets/tests/bug63000.phpt
index c806ba4c08..fb0f6b2d3a 100644
--- a/ext/sockets/tests/bug63000.phpt
+++ b/ext/sockets/tests/bug63000.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
 }
 if (PHP_OS !== 'Darwin') {
-    die('is not OSX.');
+    die('skip Is not OSX.');
 }
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/bug60120.phpt b/ext/standard/tests/file/bug60120.phpt
index 92172b9112..ec5f7b3ced 100644
--- a/ext/standard/tests/file/bug60120.phpt
+++ b/ext/standard/tests/file/bug60120.phpt
@@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 }
 $php = getenv('TEST_PHP_EXECUTABLE');
 if (!$php) {
-	die("No php executable defined\n");
+	die("skip No php executable defined\n");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/windows_links/bug48746.phpt b/ext/standard/tests/file/windows_links/bug48746.phpt
index 671c347a61..6e3431943f 100644
--- a/ext/standard/tests/file/windows_links/bug48746.phpt
+++ b/ext/standard/tests/file/windows_links/bug48746.phpt
@@ -13,7 +13,7 @@ include_once __DIR__ . '/common.inc';
 $cmd = "mklink /?";
 $ret = @exec($cmd, $output, $return_val);
 if (count($output) == 0) {
-    die("mklink.exe not found in PATH");
+    die("skip mklink.exe not found in PATH");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/windows_links/bug48746_1.phpt b/ext/standard/tests/file/windows_links/bug48746_1.phpt
index 56764bcf5f..dfd1b98f15 100644
--- a/ext/standard/tests/file/windows_links/bug48746_1.phpt
+++ b/ext/standard/tests/file/windows_links/bug48746_1.phpt
@@ -13,7 +13,7 @@ include_once __DIR__ . '/common.inc';
 $cmd = "mklink /?";
 $ret = @exec($cmd, $output, $return_val);
 if (count($output) == 0) {
-    die("mklink.exe not found in PATH");
+    die("skip mklink.exe not found in PATH");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/filters/chunked_001.phpt b/ext/standard/tests/filters/chunked_001.phpt
index 0e0f645cba..c90dd403ec 100644
--- a/ext/standard/tests/filters/chunked_001.phpt
+++ b/ext/standard/tests/filters/chunked_001.phpt
@@ -3,7 +3,7 @@ Chunked encoding
 --SKIPIF--
 <?php
 $filters = stream_get_filters();
-if(! in_array( "dechunk", $filters )) die( "chunked filter not available." );
+if(! in_array( "dechunk", $filters )) die( "skip Chunked filter not available." );
 ?>
 --INI--
 allow_url_fopen=1
diff --git a/ext/standard/tests/strings/bug72434.phpt b/ext/standard/tests/strings/bug72434.phpt
index fa31c8bf03..447ad4609c 100644
--- a/ext/standard/tests/strings/bug72434.phpt
+++ b/ext/standard/tests/strings/bug72434.phpt
@@ -2,7 +2,7 @@
 Bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
 --SKIPIF--
 <?php
-if(!class_exists('zip')) die('ZipArchive');
+if(!class_exists('zip')) die('skip ZipArchive');
 ?>
 --FILE--
 <?php
-- 
2.40.0