summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2012-05-10 16:59:39 +1000
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2012-05-25 15:25:15 +1000
commitcfe030e2971faddf397b062a7d403217f54f559f (patch)
treec80de8e2d4c001cff54d970614d50e2b36fbc4ff
parentbbd33d6394fd7df41de83d2ae80c4b8148615332 (diff)
downloadsamba-cfe030e2971faddf397b062a7d403217f54f559f.tar.gz
samba-cfe030e2971faddf397b062a7d403217f54f559f.tar.xz
samba-cfe030e2971faddf397b062a7d403217f54f559f.zip
tests: Use per node log files when running tests with local daemons
Signed-off-by: Amitay Isaacs <amitay@gmail.com> (This used to be ctdb commit 61df417821762d87ed01a7b5e64c35079940344d)
-rw-r--r--ctdb/tests/scripts/integration.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index b156ca2070..70308de618 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -558,7 +558,7 @@ daemons_start_1 ()
fi
local node_ip=$(sed -n -e "$(($pnn + 1))p" "$CTDB_NODES")
- local ctdb_options="--reclock=${TEST_VAR_DIR}/rec.lock --nlist $CTDB_NODES --nopublicipcheck --node-ip=${node_ip} --event-script-dir=${TEST_VAR_DIR}/events.d --logfile=${TEST_VAR_DIR}/daemons.log -d 3 --dbdir=${TEST_VAR_DIR}/test.db --dbdir-persistent=${TEST_VAR_DIR}/test.db/persistent --dbdir-state=${TEST_VAR_DIR}/test.db/state"
+ local ctdb_options="--reclock=${TEST_VAR_DIR}/rec.lock --nlist $CTDB_NODES --nopublicipcheck --node-ip=${node_ip} --event-script-dir=${TEST_VAR_DIR}/events.d --logfile=${TEST_VAR_DIR}/daemon.${pnn}.log -d 3 --dbdir=${TEST_VAR_DIR}/test.db --dbdir-persistent=${TEST_VAR_DIR}/test.db/persistent --dbdir-state=${TEST_VAR_DIR}/test.db/state"
if [ -z "$CTDB_TEST_REAL_CLUSTER" ]; then
ctdb_options="$ctdb_options --public-interface=lo"