Merge branch 'master' of git.php.net:php-src

2 files changed, 36 insertions, 0 deletions

diff --git a/ext/standard/tests/strings/dirname_multi.phpt b/ext/standard/tests/strings/dirname_multi.phpt
index bfd7b50ef1..febbd0c293 100644
--- a/ext/standard/tests/strings/dirname_multi.phpt
+++ b/ext/standard/tests/strings/dirname_multi.phpt
@@ -1,5 +1,10 @@
 --TEST--
 Test dirname() function : usage variations
+--SKIPIF--
+<?php
+if((substr(PHP_OS, 0, 3) == "WIN"))
+  die('skip not for Windows');
+?>
 --FILE--
 <?php
 /* Prototype: string dirname ( string $path [, int nb]);
diff --git a/ext/standard/tests/strings/dirname_multi_win.phpt b/ext/standard/tests/strings/dirname_multi_win.phpt
new file mode 100644
index 0000000000..4fed5895e6
--- /dev/null
+++ b/ext/standard/tests/strings/dirname_multi_win.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test dirname() function : usage variations
+--SKIPIF--
+<?php
+if((substr(PHP_OS, 0, 3) != "WIN"))
+  die('skip Windows only');
+?>
+--FILE--
+<?php
+/* Prototype: string dirname ( string $path [, int nb]);
+   Description: Returns directory name component of path.
+*/
+for ($i=0 ; $i<5 ; $i++) {
+	var_dump(dirname("/foo/bar/baz", $i));
+}
+var_dump(dirname("/foo/bar/baz", PHP_INT_MAX));
+var_dump(dirname("g:/foo/bar/baz", PHP_INT_MAX));
+var_dump(dirname("g:foo/bar/baz", PHP_INT_MAX));
+?>
+Done
+--EXPECTF--
+Warning: dirname(): Invalid argument, levels must be >= 1 in %sdirname_multi_win.php on line %d
+NULL
+string(8) "/foo/bar"
+string(4) "/foo"
+string(1) "\"
+string(1) "\"
+string(1) "\"
+string(3) "g:\"
+string(3) "g:."
+Done