X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftest%2Frun-bad-tdb-header.c;h=330381bb6bcb1067d197fa131da221ed854b48ef;hp=1b021003a559ab7499945e9410fa50708c27e9b0;hb=100444225380d3f5ca29424ea54703d308c7c651;hpb=23dbdf06c4521b11f7eb0f341af987d8fd92474c

diff --git a/ccan/tdb/test/run-bad-tdb-header.c b/ccan/tdb/test/run-bad-tdb-header.c
index 1b021003..330381bb 100644
--- a/ccan/tdb/test/run-bad-tdb-header.c
+++ b/ccan/tdb/test/run-bad-tdb-header.c
@@ -1,16 +1,19 @@
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tdb/check.c>
+#include <ccan/tdb/hash.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
+#include "logging.h"
 
 int main(int argc, char *argv[])
 {
@@ -20,18 +23,20 @@ int main(int argc, char *argv[])
 
 	plan_tests(11);
 	/* Can open fine if complete crap, as long as O_CREAT. */
-	fd = open("/tmp/test.tdb", O_RDWR|O_CREAT|O_TRUNC, 0600);
+	fd = open("run-bad-tdb-header.tdb", O_RDWR|O_CREAT|O_TRUNC, 0600);
 	ok1(fd >= 0);
 	ok1(write(fd, "hello world", 11) == 11);
 	close(fd);
-	tdb = tdb_open("/tmp/test.tdb", 1024, 0, O_RDWR, 0);
+	tdb = tdb_open_ex("run-bad-tdb-header.tdb", 1024, 0, O_RDWR, 0,
+			  &taplogctx, NULL);
 	ok1(!tdb);
-	tdb = tdb_open("/tmp/test.tdb", 1024, 0, O_CREAT|O_RDWR, 0600);
+	tdb = tdb_open_ex("run-bad-tdb-header.tdb", 1024, 0, O_CREAT|O_RDWR,
+			  0600, &taplogctx, NULL);
 	ok1(tdb);
 	tdb_close(tdb);
 
 	/* Now, with wrong version it should *not* overwrite. */
-	fd = open("/tmp/test.tdb", O_RDWR);
+	fd = open("run-bad-tdb-header.tdb", O_RDWR);
 	ok1(fd >= 0);
 	ok1(read(fd, &hdr, sizeof(hdr)) == sizeof(hdr));
 	ok1(hdr.version == TDB_VERSION);
@@ -40,15 +45,16 @@ int main(int argc, char *argv[])
 	ok1(write(fd, &hdr, sizeof(hdr)) == sizeof(hdr));
 	close(fd);
 
-	tdb = tdb_open("/tmp/test.tdb", 1024, 0, O_RDWR|O_CREAT, 0600);
+	tdb = tdb_open_ex("run-bad-tdb-header.tdb", 1024, 0, O_RDWR|O_CREAT,
+			  0600, &taplogctx, NULL);
 	ok1(errno == EIO);
 	ok1(!tdb);
 
 	/* With truncate, will be fine. */
-	tdb = tdb_open("/tmp/test.tdb", 1024, 0, O_RDWR|O_CREAT|O_TRUNC, 0600);
+	tdb = tdb_open_ex("run-bad-tdb-header.tdb", 1024, 0,
+			  O_RDWR|O_CREAT|O_TRUNC, 0600, &taplogctx, NULL);
 	ok1(tdb);
 	tdb_close(tdb);
-	unlink("/tmp/test.tdb");
 
 	return exit_status();
 }