From 0dab567bcc11f8c8ce59d2f4bd1e6816f1d03bdf Mon Sep 17 00:00:00 2001
From: Zoe Slattery <zoe@php.net>
Date: Tue, 21 Jul 2009 14:02:24 +0000
Subject: [PATCH] Remove empty sections. Fix bad use of --SKIP--

---
 Zend/tests/function_exists_error.phpt           |   1 -
 ext/pcre/tests/preg_split_basic.phpt            |   3 +--
 ext/posix/tests/posix_getcwd.phpt               |   2 +-
 ext/posix/tests/posix_getgrnam.phpt             |   2 +-
 ext/posix/tests/posix_getpwnam.phpt             |   2 +-
 ext/posix/tests/posix_getrlimit.phpt            |   2 +-
 ext/posix/tests/posix_initgroups.phpt           |   2 +-
 ext/posix/tests/posix_isatty.phpt               |   2 +-
 ext/posix/tests/posix_mknod.phpt                |   2 +-
 ext/standard/tests/array/bug40709.phpt          |   1 -
 .../tests/strings/addslashes_basic.phpt         |   3 +--
 .../tests/strings/addslashes_error.phpt         |   1 -
 .../tests/strings/addslashes_variation1.phpt    |   1 -
 .../tests/strings/addslashes_variation2.phpt    |   3 +--
 .../tests/strings/addslashes_variation3.phpt    |   1 -
 ext/standard/tests/strings/join_variation6.phpt | Bin 737 -> 729 bytes
 .../tests/strings/stripcslashes_variation1.phpt |   1 -
 ext/standard/tests/strings/ucwords_basic.phpt   |   1 -
 ext/standard/tests/strings/ucwords_error.phpt   |   1 -
 .../tests/strings/wordwrap_variation3.phpt      |   1 -
 20 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/Zend/tests/function_exists_error.phpt b/Zend/tests/function_exists_error.phpt
index a4c1294149..fe5eae4a34 100644
--- a/Zend/tests/function_exists_error.phpt
+++ b/Zend/tests/function_exists_error.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test function_exists() function : error conditions 
---INI--
 --FILE--
 <?php
 /* 
diff --git a/ext/pcre/tests/preg_split_basic.phpt b/ext/pcre/tests/preg_split_basic.phpt
index 324270ac3a..e94a94f62e 100644
--- a/ext/pcre/tests/preg_split_basic.phpt
+++ b/ext/pcre/tests/preg_split_basic.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test preg_split() function : basic functionality 
---INI--
 --FILE--
 <?php
 /*
@@ -73,4 +72,4 @@ array(10) {
   string(1) "("
   [9]=>
   string(1) ")"
-}
\ No newline at end of file
+}
diff --git a/ext/posix/tests/posix_getcwd.phpt b/ext/posix/tests/posix_getcwd.phpt
index 478aeccaa4..984523fc7b 100644
--- a/ext/posix/tests/posix_getcwd.phpt
+++ b/ext/posix/tests/posix_getcwd.phpt
@@ -1,6 +1,6 @@
 --TEST--
 posix_getcwd(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
 if (!function_exists('posix_getcwd')) die('skip posix_getcwd() not found');
diff --git a/ext/posix/tests/posix_getgrnam.phpt b/ext/posix/tests/posix_getgrnam.phpt
index 9d24f085e0..854db4ac16 100644
--- a/ext/posix/tests/posix_getgrnam.phpt
+++ b/ext/posix/tests/posix_getgrnam.phpt
@@ -1,6 +1,6 @@
 --TEST--
 posix_getgrnam(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
 if (!function_exists('posix_getgrnam')) die('skip posix_getgrnam() not found');
diff --git a/ext/posix/tests/posix_getpwnam.phpt b/ext/posix/tests/posix_getpwnam.phpt
index 4b89622977..b5de1e4ce2 100644
--- a/ext/posix/tests/posix_getpwnam.phpt
+++ b/ext/posix/tests/posix_getpwnam.phpt
@@ -1,6 +1,6 @@
 --TEST--
 posix_getpwnam(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
 if (!function_exists('posix_getpwnam')) die('skip posix_getpwnam() not found');
diff --git a/ext/posix/tests/posix_getrlimit.phpt b/ext/posix/tests/posix_getrlimit.phpt
index 55bd8aff8e..61da64a938 100644
--- a/ext/posix/tests/posix_getrlimit.phpt
+++ b/ext/posix/tests/posix_getrlimit.phpt
@@ -1,6 +1,6 @@
 --TEST--
 posix_getrlimit(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
 if (!function_exists('posix_getrlimit')) die('skip posix_getrlimit() not found');
diff --git a/ext/posix/tests/posix_initgroups.phpt b/ext/posix/tests/posix_initgroups.phpt
index 6ffb202f3c..60121e845d 100644
--- a/ext/posix/tests/posix_initgroups.phpt
+++ b/ext/posix/tests/posix_initgroups.phpt
@@ -1,6 +1,6 @@
 --TEST--
 posix_initgroups(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
 if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found');
diff --git a/ext/posix/tests/posix_isatty.phpt b/ext/posix/tests/posix_isatty.phpt
index 74309c299d..0b40dd1d43 100644
--- a/ext/posix/tests/posix_isatty.phpt
+++ b/ext/posix/tests/posix_isatty.phpt
@@ -1,6 +1,6 @@
 --TEST--
 posix_isatty(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
 if (!function_exists('posix_isatty')) die('skip posix_isatty() not found');
diff --git a/ext/posix/tests/posix_mknod.phpt b/ext/posix/tests/posix_mknod.phpt
index 1063abe5d3..4044fb98d9 100644
--- a/ext/posix/tests/posix_mknod.phpt
+++ b/ext/posix/tests/posix_mknod.phpt
@@ -1,6 +1,6 @@
 --TEST--
 posix_mknod(): Basic tests
---SKIP--
+--SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
 if (!function_exists('posix_mknod')) die('skip posix_mknod() not found');
diff --git a/ext/standard/tests/array/bug40709.phpt b/ext/standard/tests/array/bug40709.phpt
index 6ab6bbd410..eb0c712000 100644
--- a/ext/standard/tests/array/bug40709.phpt
+++ b/ext/standard/tests/array/bug40709.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Bug #40709 (array_reduce() behaves strange with one item stored arrays)
---SKIPIF--
 --FILE--
 <?php
 function CommaSeperatedList($a, $b) {
diff --git a/ext/standard/tests/strings/addslashes_basic.phpt b/ext/standard/tests/strings/addslashes_basic.phpt
index 6ed1210670..0912d34e48 100644
--- a/ext/standard/tests/strings/addslashes_basic.phpt
+++ b/ext/standard/tests/strings/addslashes_basic.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : basic functionality 
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
@@ -36,4 +35,4 @@ string(16) "How\'s everybody"
 string(17) "Are you \"JOHN\"?"
 string(19) "c:\\php\\addslashes"
 string(12) "hello\0world"
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/addslashes_error.phpt b/ext/standard/tests/strings/addslashes_error.phpt
index b512716934..fb1d2fee0f 100644
--- a/ext/standard/tests/strings/addslashes_error.phpt
+++ b/ext/standard/tests/strings/addslashes_error.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : error conditions 
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt
index c4f9fdd091..bb2009329c 100644
--- a/ext/standard/tests/strings/addslashes_variation1.phpt
+++ b/ext/standard/tests/strings/addslashes_variation1.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations  - non-string type argument 
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
diff --git a/ext/standard/tests/strings/addslashes_variation2.phpt b/ext/standard/tests/strings/addslashes_variation2.phpt
index 285d9058af..49009e8108 100644
--- a/ext/standard/tests/strings/addslashes_variation2.phpt
+++ b/ext/standard/tests/strings/addslashes_variation2.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations - strings with characters to be backslashed
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
@@ -192,4 +191,4 @@ This is line 2 of \"heredoc\" string"
 
 -- Iteration 34 --
 string(0) ""
-Done
\ No newline at end of file
+Done
diff --git a/ext/standard/tests/strings/addslashes_variation3.phpt b/ext/standard/tests/strings/addslashes_variation3.phpt
index 302ca7e18b..8f46ebe9a4 100644
--- a/ext/standard/tests/strings/addslashes_variation3.phpt
+++ b/ext/standard/tests/strings/addslashes_variation3.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test addslashes() function : usage variations - with magic_quotes_sybase directive ON
---INI--
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt
index e8d098115538190d9a391fa5ec148e94c1319adc..a627d77bf4b5e4d5a374c6006a8b2297481a03a3 100644
GIT binary patch
delta 10
RcmaFJdXsg6<3`UJOaK{T1S$Xk

delta 16
Xcmcb~`jB;kBde#Mr>^csyV*<tG28`V

diff --git a/ext/standard/tests/strings/stripcslashes_variation1.phpt b/ext/standard/tests/strings/stripcslashes_variation1.phpt
index 5251cab8d4..d08600cfd8 100644
--- a/ext/standard/tests/strings/stripcslashes_variation1.phpt
+++ b/ext/standard/tests/strings/stripcslashes_variation1.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test stripcslashes() function : usage variations  - non-string type argument 
---INI--
 --FILE--
 <?php
 /* Prototype  : string stripcslashes  ( string $str  )
diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt
index f34d8e9120..bba0d9bc4a 100644
--- a/ext/standard/tests/strings/ucwords_basic.phpt
+++ b/ext/standard/tests/strings/ucwords_basic.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test ucwords() function : basic functionality 
---INI--
 --FILE--
 <?php
 /* Prototype  : string ucwords ( string $str )
diff --git a/ext/standard/tests/strings/ucwords_error.phpt b/ext/standard/tests/strings/ucwords_error.phpt
index cd6e7513c3..195272f626 100644
--- a/ext/standard/tests/strings/ucwords_error.phpt
+++ b/ext/standard/tests/strings/ucwords_error.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test ucwords() function : error conditions 
---INI--
 --FILE--
 <?php
 /* Prototype  : string ucwords ( string $str )
diff --git a/ext/standard/tests/strings/wordwrap_variation3.phpt b/ext/standard/tests/strings/wordwrap_variation3.phpt
index 2f83add7bd..7d0c816707 100644
--- a/ext/standard/tests/strings/wordwrap_variation3.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation3.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test wordwrap() function : usage variations  - unexptected values for break argument
---INI--
 --FILE--
 <?php
 /* Prototype  : string wordwrap ( string $str [, int $width [, string $break [, bool $cut]]] )
-- 
2.50.1