From: Rasmus Lerdorf <rasmus@php.net>
Date: Mon, 10 Aug 2009 06:53:49 +0000 (+0000)
Subject: Tweak a few tests that failed on OSX
X-Git-Tag: php-5.2.11RC1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=545b5fcd54195678f6a1e8e0e55833c625d86703;p=php

Tweak a few tests that failed on OSX
---

diff --git a/ext/standard/tests/file/touch_variation5.phpt b/ext/standard/tests/file/touch_variation5.phpt
index f0e1f78691..a448db3ea4 100644
--- a/ext/standard/tests/file/touch_variation5.phpt
+++ b/ext/standard/tests/file/touch_variation5.phpt
@@ -178,10 +178,10 @@ PASSED: /%s/touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile - created
 Warning: touch(): Unable to create file /%s/BADDIR/aSubDirOrFile because %s in %s on line %d
 --- testing touchVar5.tmp/aSubDirOrFile/ ---
 
-Warning: touch(): Unable to create file touchVar5.tmp/aSubDirOrFile/ because Is a directory in %s on line %d
+Warning: touch(): Unable to create file touchVar5.tmp/aSubDirOrFile/ because %s in %s on line %d
 --- testing /%s/touchVar5.tmp/aSubDirOrFile/ ---
 
-Warning: touch(): Unable to create file /%s/touchVar5.tmp/aSubDirOrFile/ because Is a directory in %s on line %d
+Warning: touch(): Unable to create file /%s/touchVar5.tmp/aSubDirOrFile/ because %s in %s on line %d
 --- testing touchVar5.tmp//aSubDirOrFile ---
 PASSED: touchVar5.tmp//aSubDirOrFile - created
 --- testing /%s//touchVar5.tmp//aSubDirOrFile ---
diff --git a/ext/standard/tests/file/unlink_variation8.phpt b/ext/standard/tests/file/unlink_variation8.phpt
index e87a584f5b..e142763cef 100644
--- a/ext/standard/tests/file/unlink_variation8.phpt
+++ b/ext/standard/tests/file/unlink_variation8.phpt
@@ -178,7 +178,7 @@ Warning: unlink(/%s/BADDIR/file.tmp): No such file or directory in %s on line %d
 Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
 -- unlinking soft link unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d
 -- unlinking hard link unlinkVar8.tmp/file.tmp/ --
 
 Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
@@ -187,7 +187,7 @@ Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
 Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
 -- unlinking soft link /%s/unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d
 -- unlinking hard link /%s/unlinkVar8.tmp/file.tmp/ --
 
 Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
@@ -203,4 +203,4 @@ file removed
 file unlinked
 -- unlinking hard link /%s//unlinkVar8.tmp//file.tmp --
 file unlinked
-===DONE===
\ No newline at end of file
+===DONE===