From: Andrew Tridgell Date: Tue, 17 Apr 2007 05:01:42 +0000 (+1000) Subject: tidyups in test code X-Git-Tag: tevent-0.9.20~348^2~2904 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a3bac80b9084ead1b650714c01a8230ef3635f3;p=thirdparty%2Fsamba.git tidyups in test code (This used to be ctdb commit 43061a4cf9b0995ebe6c86e27f7fc3aacb7bb23e) --- diff --git a/ctdb/tests/ctdb_fetch.c b/ctdb/tests/ctdb_fetch.c index a292dfb4432..33396fe4f3a 100644 --- a/ctdb/tests/ctdb_fetch.c +++ b/ctdb/tests/ctdb_fetch.c @@ -63,8 +63,8 @@ static void bench_fetch_1node(struct ctdb_context *ctdb) int dest, ret; struct ctdb_record_handle *h; - key.dptr = discard_const("testkey"); - key.dsize = strlen((const char *)key.dptr); + key.dptr = discard_const(TESTKEY); + key.dsize = strlen(TESTKEY); ctdb_db = ctdb_db_handle(ctdb, "test.tdb"); diff --git a/ctdb/tests/test.sh b/ctdb/tests/test.sh index de7d8a342fb..f119ad5b1bc 100755 --- a/ctdb/tests/test.sh +++ b/ctdb/tests/test.sh @@ -5,7 +5,7 @@ killall -q ctdb_test echo "Trying 2 nodes" bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.1:9001 & -bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.2:9001 & +bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.2:9001 sleep 3 killall ctdb_test @@ -14,9 +14,7 @@ echo "Trying 4 nodes" bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.1:9001 & bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.2:9001 & bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.3:9001 & -bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.4:9001 & +bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.4:9001 sleep 3 killall ctdb_test - -