Browse Source

tdb2: make tests work in parallel.

Lazy cut & paste of tdb names causes failure when we run in parallel.
Rusty Russell 14 years ago
parent
commit
380372e733

+ 1 - 1
ccan/tdb2/test/api-21-parse_record.c

@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 
 
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 2 + 1);
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 2 + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("run-14-exists.tdb", flags[i],
+		tdb = tdb_open("api-21-parse_record.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 		if (ok1(tdb))
 		if (ok1(tdb))
 			ok1(test_records(tdb));
 			ok1(test_records(tdb));

+ 1 - 1
ccan/tdb2/test/api-80-tdb_fd.c

@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
 
 
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 3);
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 3);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("run-new_database.tdb", flags[i],
+		tdb = tdb_open("api-80-tdb_fd.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 		if (!ok1(tdb))
 		if (!ok1(tdb))
 			continue;
 			continue;

+ 1 - 1
ccan/tdb2/test/api-81-seqnum.c

@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 
 
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 15 + 8 * 13);
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 15 + 8 * 13);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("run-new_database.tdb", flags[i]|TDB_SEQNUM,
+		tdb = tdb_open("api-81-seqnum.tdb", flags[i]|TDB_SEQNUM,
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 		if (!ok1(tdb))
 		if (!ok1(tdb))
 			continue;
 			continue;

+ 1 - 1
ccan/tdb2/test/api-firstkey-nextkey.c

@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 	plan_tests(sizeof(flags) / sizeof(flags[0])
 	plan_tests(sizeof(flags) / sizeof(flags[0])
 		   * (NUM_RECORDS*6 + (NUM_RECORDS-1)*3 + 22) + 1);
 		   * (NUM_RECORDS*6 + (NUM_RECORDS-1)*3 + 22) + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("run-traverse.tdb", flags[i],
+		tdb = tdb_open("api-firstkey-nextkey.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600,
 			       O_RDWR|O_CREAT|O_TRUNC, 0600,
 			       flags[i] & TDB_VERSION1 ? NULL : &seed_attr);
 			       flags[i] & TDB_VERSION1 ? NULL : &seed_attr);
 		ok1(tdb);
 		ok1(tdb);

+ 1 - 1
ccan/tdb2/test/run-12-check.c

@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
 	failtest_suppress = true;
 	failtest_suppress = true;
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 3 + 1);
 	plan_tests(sizeof(flags) / sizeof(flags[0]) * 3 + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
-		tdb = tdb_open("run-10-simple-store.tdb", flags[i],
+		tdb = tdb_open("run-12-check.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 		ok1(tdb);
 		ok1(tdb);
 		ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
 		ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);

+ 1 - 1
ccan/tdb2/test/run-20-growhash.c

@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 		struct hash_info h;
 		struct hash_info h;
 
 
-		tdb = tdb_open("run-04-basichash.tdb", flags[i],
+		tdb = tdb_open("run-20-growhash.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &hattr);
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &hattr);
 		ok1(tdb);
 		ok1(tdb);
 		if (!tdb)
 		if (!tdb)