Browse Source

tests: now we run in tmp dir, always create temporary files in this dir.

Rusty Russell 15 years ago
parent
commit
b3804e4747

+ 1 - 1
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);

+ 6 - 7
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();
 }

+ 2 - 2
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);

+ 2 - 2
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)

+ 1 - 1
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,

+ 2 - 2
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");

+ 2 - 2
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);

+ 1 - 1
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);
 

+ 2 - 2
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));

+ 1 - 1
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

+ 2 - 2
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");

+ 1 - 1
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);

+ 1 - 1
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);

+ 2 - 2
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);

+ 1 - 1
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);

+ 1 - 1
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);

+ 1 - 1
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);

+ 1 - 1
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);

+ 1 - 1
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);