summaryrefslogtreecommitdiff
path: root/lib/tdb2/test
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2011-09-14 07:56:13 +0930
committerRusty Russell <rusty@rustcorp.com.au>2011-09-14 07:56:13 +0930
commit9140fca812063be69842a6c64030e32c65c9dff1 (patch)
tree73b9e12160be66ce7853e0e9b44ad44c17269b65 /lib/tdb2/test
parent30294c7b91456dd49b89a9b26eb0b1066087815c (diff)
downloadsamba-9140fca812063be69842a6c64030e32c65c9dff1.tar.gz
samba-9140fca812063be69842a6c64030e32c65c9dff1.tar.bz2
samba-9140fca812063be69842a6c64030e32c65c9dff1.zip
tdb2: unify tdb1_chainlock et al. into tdb_chainlock
Switch on the TDB_VERSION1 flag. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (Imported from CCAN commit ceb2f3eacbad917ee990afbc3dd800bfb0607887)
Diffstat (limited to 'lib/tdb2/test')
-rw-r--r--lib/tdb2/test/run-tdb1-no-lock-during-traverse.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c b/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c
index 71404c2d75..b2b7a781db 100644
--- a/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c
+++ b/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
hsize.base.next = &tap_log_attr;
hsize.tdb1_hashsize.hsize = 1024;
- plan_tests(43);
+ plan_tests(40);
tdb = tdb_open("run-no-lock-during-traverse.tdb1",
TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR,
0600, &hsize);
@@ -82,28 +82,28 @@ int main(int argc, char *argv[])
ok1(tdb);
ok1(prepare_entries(tdb));
ok1(locking_errors1 == 0);
- ok1(tdb1_lockall(tdb) == 0);
+ ok1(tdb_lockall(tdb) == 0);
ok1(locking_errors1 == 0);
ok1(tdb_traverse(tdb, delete_other, &errors) >= 0);
ok1(errors == 0);
ok1(locking_errors1 == 0);
- ok1(tdb1_unlockall(tdb) == 0);
+ tdb_unlockall(tdb);
ok1(prepare_entries(tdb));
ok1(locking_errors1 == 0);
- ok1(tdb1_lockall(tdb) == 0);
+ ok1(tdb_lockall(tdb) == 0);
ok1(locking_errors1 == 0);
ok1(tdb_traverse(tdb, delete_self, NULL) == NUM_ENTRIES);
ok1(locking_errors1 == 0);
- ok1(tdb1_unlockall(tdb) == 0);
+ tdb_unlockall(tdb);
ok1(prepare_entries(tdb));
ok1(locking_errors1 == 0);
- ok1(tdb1_lockall(tdb) == 0);
+ ok1(tdb_lockall(tdb) == 0);
ok1(locking_errors1 == 0);
delete_entries(tdb);
ok1(locking_errors1 == 0);
- ok1(tdb1_unlockall(tdb) == 0);
+ tdb_unlockall(tdb);
ok1(tdb_close(tdb) == 0);