cvs: php4 /tests dirname.phpt
| From: | Preston L. Bannister | Date: | Thu, 16 May 2002 15:59:44 +0000 |
| Subject: | cvs: php4 /tests dirname.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11953@lists.php.net to get a copy of this message | ||
pbannister Thu May 16 11:59:44 2002 EDT
Modified files:
/php4/tests dirname.phpt
Log:
dirname() checks that work for both Unix and Win32.
Index: php4/tests/dirname.phpt
diff -u php4/tests/dirname.phpt:1.2 php4/tests/dirname.phpt:1.3
--- php4/tests/dirname.phpt:1.2 Sun Dec 24 09:40:37 2000
+++ php4/tests/dirname.phpt Thu May 16 11:59:39 2002
@@ -3,28 +3,56 @@
--FILE--
<?php
- function check_dirname($path)
- {
- print "dirname($path) == " . dirname($path) . "\n";
- }
-
- check_dirname("/foo/");
- check_dirname("/foo");
- check_dirname("/foo/bar");
- check_dirname("d:\\foo\\bar.inc");
- check_dirname("/");
- check_dirname(".../foo");
- check_dirname("./foo");
- check_dirname("foobar///");
- check_dirname("c:\foo");
+// Allow for either Win32 or Unix.
+$s = dirname("/foo");
+// $s should be either / (Unix) or \ (Win32)
+
+function check_dirname($path) {
+ global $s;
+ $path1 = str_replace("%",$s,$path);
+ $path2 = dirname($path1);
+ $path3 = str_replace($s,"%",$path2);
+ print "dirname($path) == $path3\n";
+}
+
+check_dirname("%foo%");
+check_dirname("%foo");
+check_dirname("%foo%bar");
+check_dirname("%");
+check_dirname("...%foo");
+check_dirname(".%foo");
+check_dirname("foobar%%%");
+
+function same($a,$b) {
+ if ($a == $b) {
+ print "OK\n";
+ } else {
+ print "FAIL $a == $b\n";
+ }
+}
+
+if ('/' == $s) {
+ same(".",dirname("d:\\foo\\bar.inc"));
+ same(".",dirname("c:\\foo"));
+ same(".",dirname("c:\\"));
+ same(".",dirname("c:"));
+} else {
+ same("d:\\foo",dirname("d:\\foo\\bar.inc"));
+ same("c:\\",dirname("c:\\foo"));
+ same("c:\\",dirname("c:\\"));
+ same("c:",dirname("c:"));
+}
+
?>
--EXPECT--
-dirname(/foo/) == /
-dirname(/foo) == /
-dirname(/foo/bar) == /foo
-dirname(d:\foo\bar.inc) == .
-dirname(/) == /
-dirname(.../foo) == ...
-dirname(./foo) == .
-dirname(foobar///) == .
-dirname(c:\foo) == .
+dirname(%foo%) == %
+dirname(%foo) == %
+dirname(%foo%bar) == %foo
+dirname(%) == %
+dirname(...%foo) == ...
+dirname(.%foo) == .
+dirname(foobar%%%) == .
+OK
+OK
+OK
+OK