summaryrefslogtreecommitdiff
path: root/ext/dba/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ext/dba/tests')
-rw-r--r--ext/dba/tests/dba_db4.phpt18
-rw-r--r--ext/dba/tests/dba_handler.inc2
2 files changed, 3 insertions, 17 deletions
diff --git a/ext/dba/tests/dba_db4.phpt b/ext/dba/tests/dba_db4.phpt
index fcf089a1e9..252797bf41 100644
--- a/ext/dba/tests/dba_db4.phpt
+++ b/ext/dba/tests/dba_db4.phpt
@@ -9,6 +9,7 @@ DBA DB4 handler test
<?php
$handler = 'db4';
require_once('test.inc');
+ $lock_flag = ''; // lock in library
require_once('dba_handler.inc');
?>
===DONE===
@@ -17,22 +18,7 @@ database handler: db4
3NYNYY
Content String 2
Content 2 replaced
-Read during write: not allowed
-Content 2 replaced 2nd time
-The 6th value
-array(3) {
- ["key number 6"]=>
- string(13) "The 6th value"
- ["key2"]=>
- string(27) "Content 2 replaced 2nd time"
- ["key5"]=>
- string(23) "The last content string"
-}
---NO-LOCK--
-3NYNYY
-Content String 2
-Content 2 replaced
-Read during write: not allowed
+Read during write: allowed
Content 2 replaced 2nd time
The 6th value
array(3) {
diff --git a/ext/dba/tests/dba_handler.inc b/ext/dba/tests/dba_handler.inc
index c1e3c49c70..1c3f5127ef 100644
--- a/ext/dba/tests/dba_handler.inc
+++ b/ext/dba/tests/dba_handler.inc
@@ -73,7 +73,7 @@ do {
if (!empty($dba_reader)) {
dba_close($dba_reader);
}
- if (($db_file = dba_popen($db_filename, 'r'.($handler!='gdbm'?'-':''), $handler))!==FALSE) {
+ if (($db_file = dba_popen($db_filename, 'r'.($lock_flag==''?'':'-'), $handler))!==FALSE) {
if ($handler == 'dbm') {
dba_close($db_file);
}