summaryrefslogtreecommitdiff
path: root/bdb/test/conscript.tcl
diff options
context:
space:
mode:
Diffstat (limited to 'bdb/test/conscript.tcl')
-rw-r--r--bdb/test/conscript.tcl20
1 files changed, 10 insertions, 10 deletions
diff --git a/bdb/test/conscript.tcl b/bdb/test/conscript.tcl
index 11d0eb58e7d..fd12c6e51a0 100644
--- a/bdb/test/conscript.tcl
+++ b/bdb/test/conscript.tcl
@@ -1,9 +1,9 @@
# See the file LICENSE for redistribution information.
#
-# Copyright (c) 1999, 2000
+# Copyright (c) 1999-2002
# Sleepycat Software. All rights reserved.
#
-# $Id: conscript.tcl,v 11.12 2000/12/01 04:28:36 ubell Exp $
+# $Id: conscript.tcl,v 11.17 2002/03/22 21:43:06 krinsky Exp $
#
# Script for DB_CONSUME test (test070.tcl).
# Usage: conscript dir file runtype nitems outputfile tnum args
@@ -28,17 +28,18 @@ proc consumescript_produce { db_cmd nitems tnum args } {
set ret 0
for { set ndx 0 } { $ndx < $nitems } { incr ndx } {
set oret $ret
+ if { 0xffffffff > 0 && $oret > 0x7fffffff } {
+ incr oret [expr 0 - 0x100000000]
+ }
set ret [$db put -append [chop_data q $mydata]]
error_check_good db_put \
[expr $ret > 0 ? $oret < $ret : \
$oret < 0 ? $oret < $ret : $oret > $ret] 1
}
- # XXX: We permit incomplete syncs because they seem to
- # be unavoidable and not damaging.
+
set ret [catch {$db close} res]
- error_check_good db_close:$pid [expr ($ret == 0) ||\
- ([is_substr $res DB_INCOMPLETE] == 1)] 1
+ error_check_good db_close:$pid $ret 0
puts "\t\tTest0$tnum: Producer $pid finished."
}
@@ -67,10 +68,9 @@ proc consumescript_consume { db_cmd nitems tnum outputfile mode args } {
}
error_check_good output_close:$pid [close $oid] ""
- # XXX: see above note.
+
set ret [catch {$db close} res]
- error_check_good db_close:$pid [expr ($ret == 0) ||\
- ([is_substr $res DB_INCOMPLETE] == 1)] 1
+ error_check_good db_close:$pid $ret 0
puts "\t\tTest0$tnum: Consumer $pid finished."
}
@@ -99,7 +99,7 @@ set args [lindex [lrange $argv 6 end] 0]
set mydata "consumer data"
# Open env
-set dbenv [berkdb env -home $dir ]
+set dbenv [berkdb_env -home $dir ]
error_check_good db_env_create [is_valid_env $dbenv] TRUE
# Figure out db opening command.