Commit:    266578f58483a08d7af51714636564df36a926d0
Author:    Anatoliy Belsky <a...@php.net>         Thu, 10 May 2012 17:07:38 
+0200
Parents:   652632a89bc4ec1623ddcc41da82bd888c874b29
Branches:  PHP-5.3 PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=266578f58483a08d7af51714636564df36a926d0

Log:
Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails

Exception text differ on windows

Bugs:
https://bugs.php.net/61992
https://bugs.php.net/44295

Changed paths:
  A  ext/standard/tests/general_functions/bug44295-win.phpt
  M  ext/standard/tests/general_functions/bug44295.phpt


Diff:
diff --git a/ext/standard/tests/general_functions/bug44295-win.phpt 
b/ext/standard/tests/general_functions/bug44295-win.phpt
new file mode 100644
index 0000000..d210a54
--- /dev/null
+++ b/ext/standard/tests/general_functions/bug44295-win.phpt
@@ -0,0 +1,29 @@
+--TEST--
+user defined error handler + set_error_handling(EH_THROW)
+--SKIPIF--
+<?php
+       if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows only");
+       if (!extension_loaded("spl") || is_dir('c:\\not\\exists\\here')) 
die("skip");
+?>
+--FILE--
+<?php
+$dir = 'c:\\not\\exists\\here';
+
+set_error_handler('my_error_handler');
+function my_error_handler() {$a = func_get_args(); print "in error handler\n"; 
}
+
+try {
+        print "before\n";
+        $iter = new DirectoryIterator($dir);
+        print get_class($iter) . "\n";
+        print "after\n";
+} catch (Exception $e) {
+        print "in catch: ".$e->getMessage()."\n";
+}
+?>
+==DONE==
+<?php exit(0); ?>
+--EXPECT--
+before
+in catch: 
DirectoryIterator::__construct(c:\not\exists\here,c:\not\exists\here): The 
system cannot find the path specified. (code: 3)
+==DONE==
diff --git a/ext/standard/tests/general_functions/bug44295.phpt 
b/ext/standard/tests/general_functions/bug44295.phpt
index 9c12719..a184719 100644
--- a/ext/standard/tests/general_functions/bug44295.phpt
+++ b/ext/standard/tests/general_functions/bug44295.phpt
@@ -1,7 +1,10 @@
 --TEST--
 user defined error handler + set_error_handling(EH_THROW)
 --SKIPIF--
-<?php if (!extension_loaded("spl") || is_dir('/this/path/does/not/exist')) 
die("skip"); ?>
+<?php
+       if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows");
+       if (!extension_loaded("spl") || is_dir('/this/path/does/not/exist')) 
die("skip");
+?>
 --FILE--
 <?php
 $dir = '/this/path/does/not/exist';


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to