From 7fb16d5bd9cd5a317c52ed36b5a94fc5e0067b4a Mon Sep 17 00:00:00 2001
From: Anatoliy Belsky <ab@php.net>
Date: Wed, 9 May 2012 13:02:33 +0200
Subject: [PATCH] Fix bug 61901 ext\phar\tests\phar_buildfromdirectory2.phpt
 fails

Another error message is produced by win specific code
---
 .../tests/phar_buildfromdirectory2-win.phpt   | 30 +++++++++++++++++++
 ext/phar/tests/phar_buildfromdirectory2.phpt  |  5 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 ext/phar/tests/phar_buildfromdirectory2-win.phpt

diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
new file mode 100644
index 0000000000..9dbcf965e3
--- /dev/null
+++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Phar::buildFromDirectory() - non-directory passed as first parameter
+--SKIPIF--
+<?php
+	if (!extension_loaded("phar")) die("skip");
+	if (substr(PHP_OS, 0, 3) != "WIN") die("skip Windows only test");
+?>
+--INI--
+phar.require_hash=0
+phar.readonly=0
+--FILE--
+<?php
+try {
+	$phar = new Phar(dirname(__FILE__) . '/buildfromdirectory.phar');
+	$phar->buildFromDirectory(1);
+} catch (Exception $e) {
+	var_dump(get_class($e));
+	echo $e->getMessage() . "\n";
+}
+?>
+===DONE===
+--CLEAN--
+<?php 
+unlink(dirname(__FILE__) . '/buildfromdirectory.phar');
+__HALT_COMPILER();
+?>
+--EXPECTF--
+%s(24) "UnexpectedValueException"
+RecursiveDirectoryIterator::__construct(1,1): The system cannot find the file specified. (code: 2)
+===DONE===
diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt
index 6c67f208af..639ff0bd4b 100644
--- a/ext/phar/tests/phar_buildfromdirectory2.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory2.phpt
@@ -1,7 +1,10 @@
 --TEST--
 Phar::buildFromDirectory() - non-directory passed as first parameter
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php
+	if (!extension_loaded("phar")) die("skip");
+	if (substr(PHP_OS, 0, 3) == "WIN") die("skip not for Windows");
+?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
-- 
2.40.0