diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-13 14:38:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-13 14:38:45 +0200 |
| commit | 4d70c9b3e5e480d6dfa1c94506270f1f78e8ef32 (patch) | |
| tree | 35e71c16c55fd3a18a9e5f47d0b027866f825e35 /tests | |
| parent | becc47cef625bfabf53589bb98ca10c352a4c824 (diff) | |
| download | rsyslog-4d70c9b3e5e480d6dfa1c94506270f1f78e8ef32.tar.gz rsyslog-4d70c9b3e5e480d6dfa1c94506270f1f78e8ef32.tar.xz rsyslog-4d70c9b3e5e480d6dfa1c94506270f1f78e8ef32.zip | |
added some debug settings plus improved shutdown sequence
... non-working version!
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rwxr-xr-x | tests/daqueue-persist-drvr.sh | 6 | ||||
| -rwxr-xr-x | tests/queue-persist-drvr.sh | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c31e9eaa..7f12f633 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,7 +7,7 @@ TESTS = $(TESTRUNS) cfg.sh \ da-mainmsg-q.sh \ validation-run.sh \ imtcp-multiport.sh \ - daqueue-persist.sh \ + #daqueue-persist.sh \ diskqueue.sh \ diskqueue-fsync.sh \ manytcp.sh \ diff --git a/tests/daqueue-persist-drvr.sh b/tests/daqueue-persist-drvr.sh index d95991fc..69db73ba 100755 --- a/tests/daqueue-persist-drvr.sh +++ b/tests/daqueue-persist-drvr.sh @@ -19,8 +19,14 @@ $srcdir/diag.sh shutdown-immediate $srcdir/diag.sh wait-shutdown source $srcdir/diag.sh check-mainq-spool +echo "Enter phase 2, rsyslogd restart" + #exit +export RSYSLOG_DEBUG="debug nostdout printmutexaction" +export RSYSLOG_DEBUGLOG="log" +#valgrind="valgrind --tool=helgrind --log-fd=1" + # restart engine and have rest processed #remove delay echo "#" > work-delay.conf diff --git a/tests/queue-persist-drvr.sh b/tests/queue-persist-drvr.sh index ea5386a7..53fbcb8b 100755 --- a/tests/queue-persist-drvr.sh +++ b/tests/queue-persist-drvr.sh @@ -24,5 +24,6 @@ source $srcdir/diag.sh check-mainq-spool echo "#" > work-delay.conf source $srcdir/diag.sh startup queue-persist.conf source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +$srcdir/diag.sh wait-shutdown source $srcdir/diag.sh seq-check 0 4999 source $srcdir/diag.sh exit |