com php-src: more test fixes: ext/dba/tests/dba_db4_0 03.phpt ext/dba/tests/dba_db4_007.phpt ext/dba/tests/dba_handler.inc ext/dba/tests/dba_tcadb
.phpt
| From: | Michael Wallner | Date: | Tue, 03 Dec 2013 17:18:40 +0000 |
| Subject: | com php-src: more test fixes: ext/dba/tests/dba_db4_0 03.phpt ext/dba/tests/dba_db4_007.phpt ext/dba/tests/dba_handler.inc ext/dba/tests/dba_tcadb .phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74251@lists.php.net to get a copy of this message | ||
Commit: f0c85fab45b22dae6cbb2392d0192d7fd924d274
Author: Michael Wallner <mike@php.net> Tue, 3 Dec 2013 18:18:40 +0100
Parents: b0415856fddd93ddb02a00c56953707be199c2a9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f0c85fab45b22dae6cbb2392d0192d7fd924d274
Log:
more test fixes
Changed paths:
M ext/dba/tests/dba_db4_003.phpt
M ext/dba/tests/dba_db4_007.phpt
M ext/dba/tests/dba_handler.inc
M ext/dba/tests/dba_tcadb.phpt
Diff:
diff --git a/ext/dba/tests/dba_db4_003.phpt b/ext/dba/tests/dba_db4_003.phpt
index 7e8568c..8708170 100644
--- a/ext/dba/tests/dba_db4_003.phpt
+++ b/ext/dba/tests/dba_db4_003.phpt
@@ -39,8 +39,6 @@ require(dirname(__FILE__) .'/clean.inc');
database handler: db4
int(14)
-Notice: dba_open(): %stest0.dbm: unexpected file type or format in %sdba_db4_003.php on line %d
-
Warning: dba_open(%stest0.dbm,c): Driver initialization failed for handler: db4: Invalid argument
in %sdba_db4_003.php on line %d
Error creating %stest0.dbm
Dummy contents
diff --git a/ext/dba/tests/dba_db4_007.phpt b/ext/dba/tests/dba_db4_007.phpt
index bd95e0b..027d0af 100644
--- a/ext/dba/tests/dba_db4_007.phpt
+++ b/ext/dba/tests/dba_db4_007.phpt
@@ -35,7 +35,5 @@ require(dirname(__FILE__) .'/clean.inc');
database handler: db4
int(14)
-Notice: dba_popen(): %stest0.dbm: unexpected file type or format in %sdba_db4_007.php on line %d
-
Warning: dba_popen(%stest0.dbm,c): Driver initialization failed for handler: db4: Invalid argument
in %sdba_db4_007.php on line %d
Error creating %stest0.dbm
diff --git a/ext/dba/tests/dba_handler.inc b/ext/dba/tests/dba_handler.inc
index a950e90..ed2a524 100644
--- a/ext/dba/tests/dba_handler.inc
+++ b/ext/dba/tests/dba_handler.inc
@@ -82,7 +82,7 @@ do {
dba_close($dba_reader);
}
if (($db_file = dba_popen($db_filename,
'r'.($lock_flag==''?'':'-'), $handler))!==FALSE) {
- if ($handler == 'dbm') {
+ if ($handler == 'dbm' || $handler == "tcadb") {
dba_close($db_file);
}
}
diff --git a/ext/dba/tests/dba_tcadb.phpt b/ext/dba/tests/dba_tcadb.phpt
index 28b6dd8..f75aa81 100644
--- a/ext/dba/tests/dba_tcadb.phpt
+++ b/ext/dba/tests/dba_tcadb.phpt
@@ -16,6 +16,12 @@ DBA TCADB handler test
require_once dirname(__FILE__) .'/dba_handler.inc';
?>
===DONE===
+--CLEAN--
+<?php
+$db_filename = $db_file = dirname(__FILE__) .'/test0.tch';
+@unlink($db_filename);
+@unlink($db_filename.'.lck');
+?>
--EXPECT--
database handler: tcadb
3NYNYY