summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2011-09-14 08:13:27 +0930
committerRusty Russell <rusty@rustcorp.com.au>2011-09-14 08:13:27 +0930
commit5e3731a28101c0ee3435746e4b7340013477ad64 (patch)
tree5cdb358c34f62bce7ff6201d0327c1d83717fd25
parent67164070d5bb6697ee139b20121656670b579cdf (diff)
downloadsamba-5e3731a28101c0ee3435746e4b7340013477ad64.tar.gz
samba-5e3731a28101c0ee3435746e4b7340013477ad64.tar.bz2
samba-5e3731a28101c0ee3435746e4b7340013477ad64.zip
tdb2: make tests work in parallel.
Lazy cut & paste of tdb names causes failure when we run in parallel. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (Imported from CCAN commit 380372e733416c2b348d5307f536d0a0807e95df)
-rw-r--r--lib/tdb2/test/api-21-parse_record.c2
-rw-r--r--lib/tdb2/test/api-80-tdb_fd.c2
-rw-r--r--lib/tdb2/test/api-81-seqnum.c2
-rw-r--r--lib/tdb2/test/api-firstkey-nextkey.c2
-rw-r--r--lib/tdb2/test/run-12-check.c2
-rw-r--r--lib/tdb2/test/run-20-growhash.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/tdb2/test/api-21-parse_record.c b/lib/tdb2/test/api-21-parse_record.c
index 4a9cf05c53..def4f456ff 100644
--- a/lib/tdb2/test/api-21-parse_record.c
+++ b/lib/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);
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);
if (ok1(tdb))
ok1(test_records(tdb));
diff --git a/lib/tdb2/test/api-80-tdb_fd.c b/lib/tdb2/test/api-80-tdb_fd.c
index b321f59755..0088f9b74d 100644
--- a/lib/tdb2/test/api-80-tdb_fd.c
+++ b/lib/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);
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);
if (!ok1(tdb))
continue;
diff --git a/lib/tdb2/test/api-81-seqnum.c b/lib/tdb2/test/api-81-seqnum.c
index c41b9ce3dd..c1eb75170b 100644
--- a/lib/tdb2/test/api-81-seqnum.c
+++ b/lib/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);
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);
if (!ok1(tdb))
continue;
diff --git a/lib/tdb2/test/api-firstkey-nextkey.c b/lib/tdb2/test/api-firstkey-nextkey.c
index 0c0951416f..e0374d8680 100644
--- a/lib/tdb2/test/api-firstkey-nextkey.c
+++ b/lib/tdb2/test/api-firstkey-nextkey.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
plan_tests(sizeof(flags) / sizeof(flags[0])
* (NUM_RECORDS*6 + (NUM_RECORDS-1)*3 + 22) + 1);
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,
flags[i] & TDB_VERSION1 ? NULL : &seed_attr);
ok1(tdb);
diff --git a/lib/tdb2/test/run-12-check.c b/lib/tdb2/test/run-12-check.c
index f55b942cc5..06abe422ab 100644
--- a/lib/tdb2/test/run-12-check.c
+++ b/lib/tdb2/test/run-12-check.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
failtest_suppress = true;
plan_tests(sizeof(flags) / sizeof(flags[0]) * 3 + 1);
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);
ok1(tdb);
ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
diff --git a/lib/tdb2/test/run-20-growhash.c b/lib/tdb2/test/run-20-growhash.c
index 890bcd2781..65cead0358 100644
--- a/lib/tdb2/test/run-20-growhash.c
+++ b/lib/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++) {
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);
ok1(tdb);
if (!tdb)