From b3804e47471640f1f8c15f5013a78bdbeb12f69d Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 30 Aug 2010 12:36:23 +0930
Subject: [PATCH] tests: now we run in tmp dir, always create temporary files
 in this dir.

---
 ccan/tdb/test/run-3G-file.c                 |  2 +-
 ccan/tdb/test/run-bad-tdb-header.c          | 13 ++++++-------
 ccan/tdb/test/run-check.c                   |  4 ++--
 ccan/tdb/test/run-corrupt.c                 |  4 ++--
 ccan/tdb/test/run-die-during-transaction.c  |  2 +-
 ccan/tdb/test/run-endian.c                  |  4 ++--
 ccan/tdb/test/run-nested-transactions.c     |  4 ++--
 ccan/tdb/test/run-nested-traverse.c         |  2 +-
 ccan/tdb/test/run-no-lock-during-traverse.c |  4 ++--
 ccan/tdb/test/run-open-during-transaction.c |  2 +-
 ccan/tdb/test/run-traverse-in-transaction.c |  4 ++--
 ccan/tdb/test/run.c                         |  2 +-
 ccan/tdb2/test/run-enlarge_hash.c           |  2 +-
 ccan/tdb2/test/run-expand.c                 |  4 ++--
 ccan/tdb2/test/run-new_database.c           |  2 +-
 ccan/tdb2/test/run-record-expand.c          |  2 +-
 ccan/tdb2/test/run-simple-delete.c          |  2 +-
 ccan/tdb2/test/run-simple-fetch.c           |  2 +-
 ccan/tdb2/test/run-simple-store.c           |  2 +-
 19 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/ccan/tdb/test/run-3G-file.c b/ccan/tdb/test/run-3G-file.c
index 94639113..ea395a9c 100644
--- a/ccan/tdb/test/run-3G-file.c
+++ b/ccan/tdb/test/run-3G-file.c
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 	struct tdb_record rec;
 
 	plan_tests(24);
-	tdb = tdb_open("/tmp/test.tdb", 1024, TDB_CLEAR_IF_FIRST,
+	tdb = tdb_open("run-36-file.tdb", 1024, TDB_CLEAR_IF_FIRST,
 		       O_CREAT|O_TRUNC|O_RDWR, 0600);
 
 	ok1(tdb);
diff --git a/ccan/tdb/test/run-bad-tdb-header.c b/ccan/tdb/test/run-bad-tdb-header.c
index 3f9b6691..0303ec26 100644
--- a/ccan/tdb/test/run-bad-tdb-header.c
+++ b/ccan/tdb/test/run-bad-tdb-header.c
@@ -21,18 +21,18 @@ 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("run-bad-tdb-header.tdb", 1024, 0, O_RDWR, 0);
 	ok1(!tdb);
-	tdb = tdb_open("/tmp/test.tdb", 1024, 0, O_CREAT|O_RDWR, 0600);
+	tdb = tdb_open("run-bad-tdb-header.tdb", 1024, 0, O_CREAT|O_RDWR, 0600);
 	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);
@@ -41,15 +41,14 @@ 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("run-bad-tdb-header.tdb", 1024, 0, O_RDWR|O_CREAT, 0600);
 	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("run-bad-tdb-header.tdb", 1024, 0, O_RDWR|O_CREAT|O_TRUNC, 0600);
 	ok1(tdb);
 	tdb_close(tdb);
-	unlink("/tmp/test.tdb");
 
 	return exit_status();
 }
diff --git a/ccan/tdb/test/run-check.c b/ccan/tdb/test/run-check.c
index dfba583f..3a4a39f1 100644
--- a/ccan/tdb/test/run-check.c
+++ b/ccan/tdb/test/run-check.c
@@ -19,7 +19,7 @@ int main(int argc, char *argv[])
 	TDB_DATA key, data;
 
 	plan_tests(9);
-	tdb = tdb_open("/tmp/test5.tdb", 1, TDB_CLEAR_IF_FIRST,
+	tdb = tdb_open("run-check.tdb", 1, TDB_CLEAR_IF_FIRST,
 		       O_CREAT|O_TRUNC|O_RDWR, 0600);
 
 	ok1(tdb);
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
 	ok1(tdb_check(tdb, NULL, NULL) == 0);
 	tdb_close(tdb);
 
-	tdb = tdb_open("/tmp/test5.tdb", 1024, 0, O_RDWR, 0);
+	tdb = tdb_open("run-check.tdb", 1024, 0, O_RDWR, 0);
 	ok1(tdb);
 	ok1(tdb_check(tdb, NULL, NULL) == 0);
 	tdb_close(tdb);
diff --git a/ccan/tdb/test/run-corrupt.c b/ccan/tdb/test/run-corrupt.c
index eaa326bd..a5c4aa44 100644
--- a/ccan/tdb/test/run-corrupt.c
+++ b/ccan/tdb/test/run-corrupt.c
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
 
 	plan_tests(4);
 	/* This should use mmap. */
-	tdb = tdb_open("/tmp/test6.tdb", 2, TDB_CLEAR_IF_FIRST,
+	tdb = tdb_open("run-corrupt.tdb", 2, TDB_CLEAR_IF_FIRST,
 		       O_CREAT|O_TRUNC|O_RDWR, 0600);
 
 	if (!tdb)
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
 	tdb_close(tdb);
 
 	/* This should not. */
-	tdb = tdb_open("/tmp/test6.tdb", 2, TDB_CLEAR_IF_FIRST|TDB_NOMMAP,
+	tdb = tdb_open("run-corrupt.tdb", 2, TDB_CLEAR_IF_FIRST|TDB_NOMMAP,
 		       O_CREAT|O_TRUNC|O_RDWR, 0600);
 
 	if (!tdb)
diff --git a/ccan/tdb/test/run-die-during-transaction.c b/ccan/tdb/test/run-die-during-transaction.c
index f8000b55..ffb9fe4f 100644
--- a/ccan/tdb/test/run-die-during-transaction.c
+++ b/ccan/tdb/test/run-die-during-transaction.c
@@ -37,7 +37,7 @@ static bool in_transaction;
 static bool suppress_logging;
 static int target, current;
 static jmp_buf jmpbuf;
-#define TEST_DBNAME "/tmp/test7.tdb"
+#define TEST_DBNAME "run-die-during-transaction.tdb"
 
 static void taplog(struct tdb_context *tdb,
 		   enum tdb_debug_level level,
diff --git a/ccan/tdb/test/run-endian.c b/ccan/tdb/test/run-endian.c
index 25335a7f..9ee877dd 100644
--- a/ccan/tdb/test/run-endian.c
+++ b/ccan/tdb/test/run-endian.c
@@ -19,7 +19,7 @@ int main(int argc, char *argv[])
 	TDB_DATA key, data;
 
 	plan_tests(13);
-	tdb = tdb_open("/tmp/test.tdb", 1024, TDB_CLEAR_IF_FIRST|TDB_CONVERT,
+	tdb = tdb_open("run-endian.tdb", 1024, TDB_CLEAR_IF_FIRST|TDB_CONVERT,
 		       O_CREAT|O_TRUNC|O_RDWR, 0600);
 
 	ok1(tdb);
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 	tdb_close(tdb);
 
 	/* Reopen: should read it */
-	tdb = tdb_open("/tmp/test.tdb", 1024, 0, O_RDWR, 0);
+	tdb = tdb_open("run-endian.tdb", 1024, 0, O_RDWR, 0);
 	ok1(tdb);
 	
 	key.dsize = strlen("hi");
diff --git a/ccan/tdb/test/run-nested-transactions.c b/ccan/tdb/test/run-nested-transactions.c
index fd288955..b3983363 100644
--- a/ccan/tdb/test/run-nested-transactions.c
+++ b/ccan/tdb/test/run-nested-transactions.c
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
 	key.dsize = strlen("hi");
 	key.dptr = (void *)"hi";
 
-	tdb = tdb_open("/tmp/test4.tdb", 1024, TDB_CLEAR_IF_FIRST,
+	tdb = tdb_open("run-nested-transactions.tdb", 1024, TDB_CLEAR_IF_FIRST,
 		       O_CREAT|O_TRUNC|O_RDWR, 0600);
 	ok1(tdb);
 
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 	free(data.dptr);
 	tdb_close(tdb);
 
-	tdb = tdb_open("/tmp/test4.tdb", 1024, TDB_ALLOW_NESTING, O_RDWR, 0);
+	tdb = tdb_open("run-nested-transactions.tdb", 1024, TDB_ALLOW_NESTING, O_RDWR, 0);
 	ok1(tdb);
 
 	ok1(tdb_transaction_start(tdb) == 0);
diff --git a/ccan/tdb/test/run-nested-traverse.c b/ccan/tdb/test/run-nested-traverse.c
index 054af0d2..156946af 100644
--- a/ccan/tdb/test/run-nested-traverse.c
+++ b/ccan/tdb/test/run-nested-traverse.c
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
 	if (!agent)
 		err(1, "preparing agent");
 
-	tdb = tdb_open("/tmp/test3.tdb", 1024, TDB_CLEAR_IF_FIRST,
+	tdb = tdb_open("run-nested-traverse.tdb", 1024, TDB_CLEAR_IF_FIRST,
 		       O_CREAT|O_TRUNC|O_RDWR, 0600);
 	ok1(tdb);
 
diff --git a/ccan/tdb/test/run-no-lock-during-traverse.c b/ccan/tdb/test/run-no-lock-during-traverse.c
index 1eec04b5..a4f7668e 100644
--- a/ccan/tdb/test/run-no-lock-during-traverse.c
+++ b/ccan/tdb/test/run-no-lock-during-traverse.c
@@ -78,8 +78,8 @@ int main(int argc, char *argv[])
 	int errors = 0;
 
 	plan_tests(41);
-	tdb = tdb_open("/tmp/test8.tdb", 1024, TDB_CLEAR_IF_FIRST,
-		       O_CREAT|O_TRUNC|O_RDWR, 0600);
+	tdb = tdb_open("run-no-lock-during-traverse.tdb",
+		       1024, TDB_CLEAR_IF_FIRST, O_CREAT|O_TRUNC|O_RDWR, 0600);
 
 	ok1(tdb);
 	ok1(prepare_entries(tdb));
diff --git a/ccan/tdb/test/run-open-during-transaction.c b/ccan/tdb/test/run-open-during-transaction.c
index 908dc7da..0c4934c5 100644
--- a/ccan/tdb/test/run-open-during-transaction.c
+++ b/ccan/tdb/test/run-open-during-transaction.c
@@ -36,7 +36,7 @@ static bool snapshot_uptodate;
 static char *snapshot;
 static off_t snapshot_len;
 static bool clear_if_first;
-#define TEST_DBNAME "/tmp/test7.tdb"
+#define TEST_DBNAME "run-open-during-transaction.tdb"
 
 #undef write
 #undef pwrite
diff --git a/ccan/tdb/test/run-traverse-in-transaction.c b/ccan/tdb/test/run-traverse-in-transaction.c
index 0a74055b..58ff750b 100644
--- a/ccan/tdb/test/run-traverse-in-transaction.c
+++ b/ccan/tdb/test/run-traverse-in-transaction.c
@@ -47,8 +47,8 @@ int main(int argc, char *argv[])
 	if (!agent)
 		err(1, "preparing agent");
 
-	tdb = tdb_open("/tmp/test2.tdb", 1024, TDB_CLEAR_IF_FIRST,
-		       O_CREAT|O_TRUNC|O_RDWR, 0600);
+	tdb = tdb_open("run-traverse-in-transaction.tdb",
+		       1024, TDB_CLEAR_IF_FIRST, O_CREAT|O_TRUNC|O_RDWR, 0600);
 	ok1(tdb);
 
 	key.dsize = strlen("hi");
diff --git a/ccan/tdb/test/run.c b/ccan/tdb/test/run.c
index f7fc2a0a..b6202fe7 100644
--- a/ccan/tdb/test/run.c
+++ b/ccan/tdb/test/run.c
@@ -19,7 +19,7 @@ int main(int argc, char *argv[])
 	TDB_DATA key, data;
 
 	plan_tests(10);
-	tdb = tdb_open("/tmp/test.tdb", 1024, TDB_CLEAR_IF_FIRST,
+	tdb = tdb_open("run.tdb", 1024, TDB_CLEAR_IF_FIRST,
 		       O_CREAT|O_TRUNC|O_RDWR, 0600);
 
 	ok1(tdb);
diff --git a/ccan/tdb2/test/run-enlarge_hash.c b/ccan/tdb2/test/run-enlarge_hash.c
index 10ded59b..539ff510 100644
--- a/ccan/tdb2/test/run-enlarge_hash.c
+++ b/ccan/tdb2/test/run-enlarge_hash.c
@@ -15,7 +15,7 @@ int main(int argc, char *argv[])
 
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 2 + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("/tmp/run-new_database.tdb", flags[i],
+		tdb = tdb_open("run-enlarge-hash.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, NULL);
 		tdb->log = tap_log_fn;
 		ok1(tdb);
diff --git a/ccan/tdb2/test/run-expand.c b/ccan/tdb2/test/run-expand.c
index 7785969c..2319e91b 100644
--- a/ccan/tdb2/test/run-expand.c
+++ b/ccan/tdb2/test/run-expand.c
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
 
 	/* First, lower level expansion tests. */
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("/tmp/run-new_database.tdb", flags[i],
+		tdb = tdb_open("run-expand.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, NULL);
 		tdb->log = tap_log_fn;
 		ok1(tdb);
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
 
 	/* Now using tdb_expand. */
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("/tmp/run-new_database.tdb", flags[i],
+		tdb = tdb_open("run-expand.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, NULL);
 		tdb->log = tap_log_fn;
 		ok1(tdb);
diff --git a/ccan/tdb2/test/run-new_database.c b/ccan/tdb2/test/run-new_database.c
index 28bae2a8..45675e2e 100644
--- a/ccan/tdb2/test/run-new_database.c
+++ b/ccan/tdb2/test/run-new_database.c
@@ -15,7 +15,7 @@ int main(int argc, char *argv[])
 
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 2 + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("/tmp/run-new_database.tdb", flags[i],
+		tdb = tdb_open("run-new_database", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, NULL);
 		tdb->log = tap_log_fn;
 		ok1(tdb);
diff --git a/ccan/tdb2/test/run-record-expand.c b/ccan/tdb2/test/run-record-expand.c
index 53befc1d..918833d9 100644
--- a/ccan/tdb2/test/run-record-expand.c
+++ b/ccan/tdb2/test/run-record-expand.c
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 	plan_tests(sizeof(flags) / sizeof(flags[0])
 		   * (3 + (1 + (MAX_SIZE/SIZE_STEP)) * 2) + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("/tmp/run-new_database.tdb", flags[i],
+		tdb = tdb_open("run-record-expand.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, NULL);
 		tdb->log = tap_log_fn;
 		ok1(tdb);
diff --git a/ccan/tdb2/test/run-simple-delete.c b/ccan/tdb2/test/run-simple-delete.c
index 37e9a462..eb700111 100644
--- a/ccan/tdb2/test/run-simple-delete.c
+++ b/ccan/tdb2/test/run-simple-delete.c
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
 
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 8 + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("/tmp/run-new_database.tdb", flags[i],
+		tdb = tdb_open("run-simple-delete.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, NULL);
 		tdb->log = tap_log_fn;
 		ok1(tdb);
diff --git a/ccan/tdb2/test/run-simple-fetch.c b/ccan/tdb2/test/run-simple-fetch.c
index 18028442..dd4f7d40 100644
--- a/ccan/tdb2/test/run-simple-fetch.c
+++ b/ccan/tdb2/test/run-simple-fetch.c
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
 
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 8 + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("/tmp/run-new_database.tdb", flags[i],
+		tdb = tdb_open("run-simple-fetch.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, NULL);
 		tdb->log = tap_log_fn;
 		ok1(tdb);
diff --git a/ccan/tdb2/test/run-simple-store.c b/ccan/tdb2/test/run-simple-store.c
index 44ac9071..4e340da1 100644
--- a/ccan/tdb2/test/run-simple-store.c
+++ b/ccan/tdb2/test/run-simple-store.c
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
 
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 9 + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("/tmp/run-new_database.tdb", flags[i],
+		tdb = tdb_open("run-simple-store.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, NULL);
 		tdb->log = tap_log_fn;
 		ok1(tdb);
-- 
2.39.2