From: Scott MacVicar <scottmac@php.net>
Date: Sun, 15 Mar 2009 23:17:28 +0000 (+0000)
Subject: MFH fileinfo tests are missing skipif
X-Git-Tag: RELEASE_1_3_5~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e10b18693c6155a75ff9c15bd4d497c783b76b04;p=php

MFH fileinfo tests are missing skipif
---

diff --git a/ext/fileinfo/tests/finfo_buffer_basic.phpt b/ext/fileinfo/tests/finfo_buffer_basic.phpt
index 59bfff9ffb..0c3c641388 100644
--- a/ext/fileinfo/tests/finfo_buffer_basic.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test finfo_buffer() function : basic functionality 
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
diff --git a/ext/fileinfo/tests/finfo_buffer_error.phpt b/ext/fileinfo/tests/finfo_buffer_error.phpt
index b178d7b743..088836fc27 100644
--- a/ext/fileinfo/tests/finfo_buffer_error.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_error.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test finfo_buffer() function : error conditions 
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
diff --git a/ext/fileinfo/tests/finfo_buffer_variation1.phpt b/ext/fileinfo/tests/finfo_buffer_variation1.phpt
index 4096f5137f..4fdd2be272 100644
--- a/ext/fileinfo/tests/finfo_buffer_variation1.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test finfo_buffer() function : basic functionality 
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
diff --git a/ext/fileinfo/tests/finfo_close_basic.phpt b/ext/fileinfo/tests/finfo_close_basic.phpt
index e1e5813aac..966431d99d 100644
--- a/ext/fileinfo/tests/finfo_close_basic.phpt
+++ b/ext/fileinfo/tests/finfo_close_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test finfo_close() function : basic functionality 
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : resource finfo_close(resource finfo)
diff --git a/ext/fileinfo/tests/finfo_close_error.phpt b/ext/fileinfo/tests/finfo_close_error.phpt
index 0294a250d5..85dc75406e 100644
--- a/ext/fileinfo/tests/finfo_close_error.phpt
+++ b/ext/fileinfo/tests/finfo_close_error.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test finfo_close() function : error conditions 
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : resource finfo_close(resource finfo)
diff --git a/ext/fileinfo/tests/finfo_file_001.phpt b/ext/fileinfo/tests/finfo_file_001.phpt
index 72af3dbe4b..7452b5265b 100644
--- a/ext/fileinfo/tests/finfo_file_001.phpt
+++ b/ext/fileinfo/tests/finfo_file_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 finfo_file(): Testing file names
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 
diff --git a/ext/fileinfo/tests/finfo_file_002.phpt b/ext/fileinfo/tests/finfo_file_002.phpt
index f0349ef6ea..6b8ae28ceb 100644
--- a/ext/fileinfo/tests/finfo_file_002.phpt
+++ b/ext/fileinfo/tests/finfo_file_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 finfo_file(): Testing mime types
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 
diff --git a/ext/fileinfo/tests/finfo_file_basic.phpt b/ext/fileinfo/tests/finfo_file_basic.phpt
index ca9e81a741..8a536ca5aa 100644
--- a/ext/fileinfo/tests/finfo_file_basic.phpt
+++ b/ext/fileinfo/tests/finfo_file_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test finfo_file() function : basic functionality 
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : string finfo_file(resource finfo, char *file_name [, int options [, resource context]])
diff --git a/ext/fileinfo/tests/finfo_open_001.phpt b/ext/fileinfo/tests/finfo_open_001.phpt
index 550eb0d4ec..0223a381cb 100644
--- a/ext/fileinfo/tests/finfo_open_001.phpt
+++ b/ext/fileinfo/tests/finfo_open_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 finfo_open(): Testing magic_file names
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 
diff --git a/ext/fileinfo/tests/finfo_open_basic.phpt b/ext/fileinfo/tests/finfo_open_basic.phpt
index 0a9cb36e56..30fe7c2364 100644
--- a/ext/fileinfo/tests/finfo_open_basic.phpt
+++ b/ext/fileinfo/tests/finfo_open_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test finfo_open() function : basic functionality 
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : resource finfo_open([int options [, string arg]])
diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt
index 4aa3736783..2876b17884 100644
--- a/ext/fileinfo/tests/finfo_open_error.phpt
+++ b/ext/fileinfo/tests/finfo_open_error.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test finfo_open() function : error functionality 
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : resource finfo_open([int options [, string arg]])
diff --git a/ext/fileinfo/tests/finfo_open_variation1.phpt b/ext/fileinfo/tests/finfo_open_variation1.phpt
index 9e33660a66..1bc46f4ad3 100644
--- a/ext/fileinfo/tests/finfo_open_variation1.phpt
+++ b/ext/fileinfo/tests/finfo_open_variation1.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test finfo_open() function : variations in opening
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : resource finfo_open([int options [, string arg]])
diff --git a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt
index 9f1c2cc14d..c43ba4e298 100644
--- a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt
+++ b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test finfo extention : loading into phpinfo()
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 
diff --git a/ext/fileinfo/tests/finfo_set_flags_basic.phpt b/ext/fileinfo/tests/finfo_set_flags_basic.phpt
index 59e725318a..5b5ab517b1 100644
--- a/ext/fileinfo/tests/finfo_set_flags_basic.phpt
+++ b/ext/fileinfo/tests/finfo_set_flags_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test finfo_set_flags() function : basic functionality 
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : bool finfo_set_flags(resource finfo, int options)
diff --git a/ext/fileinfo/tests/mime_content_type_001.phpt b/ext/fileinfo/tests/mime_content_type_001.phpt
index 5ea8ab8a6b..5adab8f53c 100644
--- a/ext/fileinfo/tests/mime_content_type_001.phpt
+++ b/ext/fileinfo/tests/mime_content_type_001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mime_content_type(): Testing wrong parameters
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 
diff --git a/ext/fileinfo/tests/mime_content_type_002.phpt b/ext/fileinfo/tests/mime_content_type_002.phpt
index ba2df03171..e56b2b198a 100644
--- a/ext/fileinfo/tests/mime_content_type_002.phpt
+++ b/ext/fileinfo/tests/mime_content_type_002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mime_content_type(): Testing parameter
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 	
diff --git a/ext/fileinfo/tests/skipif.inc b/ext/fileinfo/tests/skipif.inc
new file mode 100644
index 0000000000..405800971e
--- /dev/null
+++ b/ext/fileinfo/tests/skipif.inc
@@ -0,0 +1,7 @@
+<?php
+
+if (!extension_loaded('fileinfo')) {
+	die("skip");
+}
+
+?>