From 1efa1bae6483ac8ab4830307713c6b88f86e38e3 Mon Sep 17 00:00:00 2001
From: Zoe Slattery <zoe@php.net>
Date: Fri, 23 Jan 2009 09:43:35 +0000
Subject: [PATCH] fix tests

---
 .../tests/file/filetype_variation2.phpt       | 18 ++++--------
 .../tests/file/filetype_variation3.phpt       | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 ext/standard/tests/file/filetype_variation3.phpt

diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt
index 95885757cd..2a8e471b78 100644
--- a/ext/standard/tests/file/filetype_variation2.phpt
+++ b/ext/standard/tests/file/filetype_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test filetype() function: Variations
+Test filetype() function: Check character type
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -7,6 +7,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip no /dev on Windows');
 }
+if (!file_exists("/dev/console")) {
+    die('skip /dev/console not available);
 ?>
 --FILE--
 <?php
@@ -16,21 +18,11 @@ Description: Returns the type of the file. Possible values are fifo, char,
              dir, block, link, file, and unknown. 
 */
 
-echo "*** Testing filetype() with various types ***\n";
 echo "-- Checking for char --\n";
 print( filetype("/dev/console") )."\n";
-
-echo "-- Checking for block --\n";
-//we have cheated in our mac build by creating a ram0 block device.
-print( filetype("/dev/ram0") )."\n";
-
-echo "\n*** Done ***\n";
 ?>
+===DONE===
 --EXPECTF--
-*** Testing filetype() with various types ***
 -- Checking for char --
 char
--- Checking for block --
-block
-
-*** Done ***
+===DONE===
diff --git a/ext/standard/tests/file/filetype_variation3.phpt b/ext/standard/tests/file/filetype_variation3.phpt
new file mode 100644
index 0000000000..505961dfa9
--- /dev/null
+++ b/ext/standard/tests/file/filetype_variation3.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Test filetype() function: Check block device
+--CREDITS--
+Dave Kelsey <d_kelsey@uk.ibm.com>
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip no /dev on Windows');
+}
+if (!file_exists("/dev/ram0")) {
+    die('skip /dev/ram0 not available);
+?>
+--FILE--
+<?php
+/*
+Prototype: string filetype ( string $filename );
+Description: Returns the type of the file. Possible values are fifo, char,
+             dir, block, link, file, and unknown. 
+*/
+
+echo "-- Checking for block --\n";
+print( filetype("/dev/ram0") )."\n";
+?>
+===DONE===
+--EXPECTF--
+-- Checking for block --
+block
+===DONE===
-- 
2.50.1