X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-simple-delete.c;h=84acd194d8b00b1ac04e6a745bc1c009e9d1c809;hp=deb7ebf2a484387cdd72b1e90a1d1734d85458f1;hb=d9cbd7d4454ae35e4e2f6d18a9469bf26948e4b9;hpb=5e8b9af5e7fe5f1ccac407873a3b782b8a629782

diff --git a/ccan/tdb2/test/run-simple-delete.c b/ccan/tdb2/test/run-simple-delete.c
index deb7ebf2..84acd194 100644
--- a/ccan/tdb2/test/run-simple-delete.c
+++ b/ccan/tdb2/test/run-simple-delete.c
@@ -1,10 +1,4 @@
-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 
@@ -14,19 +8,23 @@ int main(int argc, char *argv[])
 	struct tdb_context *tdb;
 	int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
 			TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT, 
-			TDB_NOMMAP|TDB_CONVERT };
-	struct tdb_data key = { (unsigned char *)"key", 3 };
-	struct tdb_data data = { (unsigned char *)"data", 4 };
+			TDB_NOMMAP|TDB_CONVERT,
+			TDB_INTERNAL|TDB_VERSION1, TDB_VERSION1,
+			TDB_NOMMAP|TDB_VERSION1,
+			TDB_INTERNAL|TDB_CONVERT|TDB_VERSION1,
+			TDB_CONVERT|TDB_VERSION1,
+			TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 };
+	struct tdb_data key = tdb_mkdata("key", 3);
+	struct tdb_data data = tdb_mkdata("data", 4);
 
-	plan_tests(sizeof(flags) / sizeof(flags[0]) * 8 + 1);
+	plan_tests(sizeof(flags) / sizeof(flags[0]) * 7 + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 		tdb = tdb_open("run-simple-delete.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 		ok1(tdb);
 		if (tdb) {
 			/* Delete should fail. */
-			ok1(tdb_delete(tdb, key) == -1);
-			ok1(tdb_error(tdb) == TDB_ERR_NOEXIST);
+			ok1(tdb_delete(tdb, key) == TDB_ERR_NOEXIST);
 			ok1(tdb_check(tdb, NULL, NULL) == 0);
 			/* Insert should succeed. */
 			ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);