diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 08:13:26 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 08:13:26 +0930 |
| commit | 01b2214a1893db5071addf1fdf17e9ac06ed63a0 (patch) | |
| tree | e3fe69fccee166bef42e4dbad2bc2f1655824fdb /lib/tdb2/test/run-83-openhook.c | |
| parent | ef70f5dd35974115a85850d04b0f4b64e511659f (diff) | |
| download | samba-01b2214a1893db5071addf1fdf17e9ac06ed63a0.tar.gz samba-01b2214a1893db5071addf1fdf17e9ac06ed63a0.tar.bz2 samba-01b2214a1893db5071addf1fdf17e9ac06ed63a0.zip | |
tdb2: test: try (almost) all tests with TDB_VERSION1 flag.
There are some minor changes required, in particular:
1) Make sure lockcheck understands tdb1 allrecord lock upgrades.
2) Handle tdb1 sequence number jumps: various operations increment the
sequence number twice, especually tdb_append.
3) Don't test fail on unlock, since it gets triggered with traversal on the
tdb1 backend (we didn't actually ever test this case for tdb2).
4) Move clear_if_first to offset 4, to match tdb1.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 818ed29730b030ce79855fc35c212b51adff3180)
Diffstat (limited to 'lib/tdb2/test/run-83-openhook.c')
| -rw-r--r-- | lib/tdb2/test/run-83-openhook.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/tdb2/test/run-83-openhook.c b/lib/tdb2/test/run-83-openhook.c index 69447b54d8..d43f634a69 100644 --- a/lib/tdb2/test/run-83-openhook.c +++ b/lib/tdb2/test/run-83-openhook.c @@ -9,7 +9,8 @@ static enum TDB_ERROR clear_if_first(int fd, void *arg) { -/* We hold a lock offset 63 always, so we can tell if anyone is holding it. */ +/* We hold a lock offset 4 always, so we can tell if anyone is holding it. + * (This is compatible with tdb1's TDB_CLEAR_IF_FIRST flag). */ struct flock fl; if (arg != clear_if_first) @@ -17,7 +18,7 @@ static enum TDB_ERROR clear_if_first(int fd, void *arg) fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; - fl.l_start = 63; + fl.l_start = 4; fl.l_len = 1; if (fcntl(fd, F_SETLK, &fl) == 0) { @@ -42,7 +43,10 @@ int main(int argc, char *argv[]) union tdb_attribute cif; struct tdb_data key = tdb_mkdata("key", 3); int flags[] = { TDB_DEFAULT, TDB_NOMMAP, - TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT }; + TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT, + TDB_VERSION1, TDB_NOMMAP|TDB_VERSION1, + TDB_CONVERT|TDB_VERSION1, + TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 }; cif.openhook.base.attr = TDB_ATTRIBUTE_OPENHOOK; cif.openhook.base.next = &tap_log_attr; |