diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-18 22:30:25 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-19 05:38:05 +0200 |
| commit | cab6e116786641e28747de3f70c8cd89ba17673f (patch) | |
| tree | e41622bfd16ed94a6bb67a91a409ac970a22c533 /lib/tdb2/test/api-fork-test.c | |
| parent | 6244f668a34279e6da62213333dfb32c3ccdb17d (diff) | |
| download | samba-cab6e116786641e28747de3f70c8cd89ba17673f.tar.gz samba-cab6e116786641e28747de3f70c8cd89ba17673f.tar.bz2 samba-cab6e116786641e28747de3f70c8cd89ba17673f.zip | |
TDB2: remove TDB1 compatibility.
This rips out all the TDB1 compatibility from tdb2.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb2/test/api-fork-test.c')
| -rw-r--r-- | lib/tdb2/test/api-fork-test.c | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/lib/tdb2/test/api-fork-test.c b/lib/tdb2/test/api-fork-test.c index 988004e90a..934c71cbe8 100644 --- a/lib/tdb2/test/api-fork-test.c +++ b/lib/tdb2/test/api-fork-test.c @@ -25,24 +25,16 @@ static enum TDB_ERROR fork_in_parse(TDB_DATA key, TDB_DATA data, struct tdb_context *tdb) { - int status, extra_messages; - - if (tdb_get_flags(tdb) & TDB_VERSION1) { - extra_messages = 1; - } else { - extra_messages = 0; - } + int status; if (fork() == 0) { /* We expect this to fail. */ if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK) exit(1); - tap_log_messages -= extra_messages; if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK) exit(1); - tap_log_messages -= extra_messages; if (tap_log_messages != 2) exit(2); @@ -61,22 +53,13 @@ int main(int argc, char *argv[]) unsigned int i; struct tdb_context *tdb; int flags[] = { TDB_DEFAULT, TDB_NOMMAP, - TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT, - TDB_VERSION1, TDB_NOMMAP|TDB_VERSION1, - TDB_CONVERT|TDB_VERSION1, - TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 }; + TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT }; struct tdb_data key = tdb_mkdata("key", 3); struct tdb_data data = tdb_mkdata("data", 4); plan_tests(sizeof(flags) / sizeof(flags[0]) * 14); for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) { - int status, extra_messages; - - if (flags[i] & TDB_VERSION1) { - extra_messages = 1; - } else { - extra_messages = 0; - } + int status; tap_log_messages = 0; @@ -93,11 +76,9 @@ int main(int argc, char *argv[]) /* We expect this to fail. */ if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK) return 1; - tap_log_messages -= extra_messages; if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK) return 1; - tap_log_messages -= extra_messages; if (tap_log_messages != 2) return 2; @@ -119,11 +100,9 @@ int main(int argc, char *argv[]) /* We expect this to fail. */ if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK) return 1; - tap_log_messages -= extra_messages; if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK) return 1; - tap_log_messages -= extra_messages; if (tap_log_messages != 2) return 2; @@ -146,11 +125,9 @@ int main(int argc, char *argv[]) /* This would always fail anyway... */ if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK) return 1; - tap_log_messages -= extra_messages; if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK) return 1; - tap_log_messages -= extra_messages; if (tap_log_messages != 2) return 2; @@ -174,18 +151,15 @@ int main(int argc, char *argv[]) /* We expect this to fail. */ if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK) return 1; - tap_log_messages -= extra_messages; if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK) return 1; - tap_log_messages -= extra_messages; if (tap_log_messages != 2) return 2; if (tdb_transaction_commit(tdb) != TDB_ERR_LOCK) return 3; - tap_log_messages -= extra_messages; tdb_close(tdb); if (tap_log_messages < 3) |