diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-04-24 14:03:41 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2012-04-27 15:42:42 +1000 |
| commit | 451e66033817ff013c7940bfa671dfbd497a077e (patch) | |
| tree | ce10b08dcc6d27d07e293cfe6d86ea95d5c42d3b | |
| parent | cb0995906327bf137b9ae402ef25e5b7e6bfd59e (diff) | |
| download | samba-451e66033817ff013c7940bfa671dfbd497a077e.tar.gz samba-451e66033817ff013c7940bfa671dfbd497a077e.tar.xz samba-451e66033817ff013c7940bfa671dfbd497a077e.zip | |
tests: Time logging in integration tests should use TEST_VAR_DIR
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 734cbd7def23236d418ebc6d813a748a84900101)
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 2 | ||||
| -rwxr-xr-x | ctdb/tests/simple/00_ctdb_onnode.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 776ceec855..2dab6d77e4 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -49,7 +49,7 @@ ctdb_check_time_logs () local ds_prev="" local node="" - out=$(onnode all tail -n 20 /var/log/ctdb.test.time.log 2>&1) + out=$(onnode all tail -n 20 "${TEST_VAR_DIR}/ctdb.test.time.log" 2>&1) if [ $? -eq 0 ] ; then local line diff --git a/ctdb/tests/simple/00_ctdb_onnode.sh b/ctdb/tests/simple/00_ctdb_onnode.sh index af6cdb5150..0904fdfa79 100755 --- a/ctdb/tests/simple/00_ctdb_onnode.sh +++ b/ctdb/tests/simple/00_ctdb_onnode.sh @@ -33,6 +33,6 @@ onnode all onnode all true # each node that we can examine later if tests fail weirdly. if [ -z "$TEST_LOCAL_DAEMONS" -a -n "$CTDB_TEST_TIME_LOGGING" ] ; then echo "Starting time logging on each node..." - f="/var/log/ctdb.test.time.log" + f="${TEST_VAR_DIR}/ctdb.test.time.log" onnode -p all "[ -f $f ] || while : ; do date '+%s %N' ; sleep 1 ; done >$f 2>&1 </dev/null &" & fi |