summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2007-04-18 08:06:29 +0000
committerAntony Dovgal <tony2001@php.net>2007-04-18 08:06:29 +0000
commitbb489851e941a5e1cd76887d01bb199d2865f579 (patch)
tree3264958f842431af00b3c50eff15a47123c19ea7
parent1d56aa095a7b00933ba232d2f969793a76230ca3 (diff)
downloadphp-git-bb489851e941a5e1cd76887d01bb199d2865f579.tar.gz
win32 test fixes
-rw-r--r--ext/dba/tests/dba007.phpt8
-rw-r--r--ext/mcrypt/tests/bug35496.phpt4
-rw-r--r--ext/pdo_mysql/tests/bug_37445.phpt3
-rwxr-xr-xext/spl/tests/iterator_044.phpt4
-rw-r--r--tests/classes/abstract_static.phpt4
5 files changed, 12 insertions, 11 deletions
diff --git a/ext/dba/tests/dba007.phpt b/ext/dba/tests/dba007.phpt
index 577dacc68c..cc84a729c3 100644
--- a/ext/dba/tests/dba007.phpt
+++ b/ext/dba/tests/dba007.phpt
@@ -37,9 +37,9 @@ database file created
database file created
array(3) {
[%d]=>
- string(%d) "%s/dba/tests/test0.dbm"
+ string(%d) "%stest0.dbm"
[%d]=>
- string(%d) "%s/dba/tests/test1.dbm"
+ string(%d) "%stest1.dbm"
[%d]=>
- string(%d) "%s/dba/tests/test2.dbm"
-} \ No newline at end of file
+ string(%d) "%stest2.dbm"
+}
diff --git a/ext/mcrypt/tests/bug35496.phpt b/ext/mcrypt/tests/bug35496.phpt
index 9d94ba4ca9..3add65e02d 100644
--- a/ext/mcrypt/tests/bug35496.phpt
+++ b/ext/mcrypt/tests/bug35496.phpt
@@ -9,6 +9,6 @@ mcrypt_generic($td, "foobar");
mdecrypt_generic($td, "baz");
?>
--EXPECTF--
-Warning: mcrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %s/bug35496.php on line 3
+Warning: mcrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %sbug35496.php on line 3
-Warning: mdecrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %s/bug35496.php on line 4
+Warning: mdecrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %sbug35496.php on line 4
diff --git a/ext/pdo_mysql/tests/bug_37445.phpt b/ext/pdo_mysql/tests/bug_37445.phpt
index 0435fa7388..524a3d0807 100644
--- a/ext/pdo_mysql/tests/bug_37445.phpt
+++ b/ext/pdo_mysql/tests/bug_37445.phpt
@@ -16,5 +16,6 @@ $db->setAttribute(PDO :: ATTR_EMULATE_PREPARES, true);
$stmt = $db->prepare("SELECT 1");
$stmt->bindParam(':a', 'b');
+?>
--EXPECTF--
-Fatal error: Cannot pass parameter 2 by reference in %s/bug_37445.php on line %d
+Fatal error: Cannot pass parameter 2 by reference in %sbug_37445.php on line %d
diff --git a/ext/spl/tests/iterator_044.phpt b/ext/spl/tests/iterator_044.phpt
index e25e0d1dda..d3c625314f 100755
--- a/ext/spl/tests/iterator_044.phpt
+++ b/ext/spl/tests/iterator_044.phpt
@@ -76,10 +76,10 @@ Exception: MyCachingIterator does not use a full cache (see CachingIterator::__c
Notice: Undefined index: 0 in %siterator_044.php on line %d
Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct)
-Warning: CachingIterator::offsetExists() expects exactly 1 parameter, 0 given in %s/iterator_044.php on line %d
+Warning: CachingIterator::offsetExists() expects exactly 1 parameter, 0 given in %siterator_044.php on line %d
NULL
-Warning: CachingIterator::offsetGet() expects exactly 1 parameter, 0 given in %s/iterator_044.php on line %d
+Warning: CachingIterator::offsetGet() expects exactly 1 parameter, 0 given in %siterator_044.php on line %d
NULL
===0===
int(0)
diff --git a/tests/classes/abstract_static.phpt b/tests/classes/abstract_static.phpt
index f25d7cff47..bcebec599f 100644
--- a/tests/classes/abstract_static.phpt
+++ b/tests/classes/abstract_static.phpt
@@ -31,6 +31,6 @@ echo "Done\n"; // shouldn't be displayed
--EXPECTF--
Call to function show()
-Strict Standards: Static function fail::func() should not be abstract in %stests/classes/abstract_static.php(%d) : eval()'d code on line %d
+Strict Standards: Static function fail::func() should not be abstract in %sabstract_static.php(%d) : eval()'d code on line %d
-Fatal error: Class fail contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (fail::func) in %s/tests/classes/abstract_static.php(%d) : eval()'d code on line %d
+Fatal error: Class fail contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (fail::func) in %sabstract_static.php(%d) : eval()'d code on line %d