summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-27 19:43:28 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-27 19:43:28 +0200
commitd4564f8399f4362c7e79066370049f909cef996c (patch)
tree88f07eb0a76a5ca55a1948cccc0c3c38e6c517f3 /tests
parentaffa217cc2d22fa8037a50b8d40d3372694ff855 (diff)
downloadrsyslog-d4564f8399f4362c7e79066370049f909cef996c.tar.gz
rsyslog-d4564f8399f4362c7e79066370049f909cef996c.tar.xz
rsyslog-d4564f8399f4362c7e79066370049f909cef996c.zip
interim commit: working on failure cases
slightly improved situation, would like to save it before carrying on
Diffstat (limited to 'tests')
-rwxr-xr-xtests/daqueue-persist-drvr.sh3
-rwxr-xr-xtests/diag.sh7
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/daqueue-persist-drvr.sh b/tests/daqueue-persist-drvr.sh
index 11058110..0ec76b47 100755
--- a/tests/daqueue-persist-drvr.sh
+++ b/tests/daqueue-persist-drvr.sh
@@ -19,6 +19,9 @@ $srcdir/diag.sh shutdown-immediate
$srcdir/diag.sh wait-shutdown
source $srcdir/diag.sh check-mainq-spool
+echo DEBUG EXIT!
+#exit
+
# restart engine and have rest processed
#remove delay
echo "#" > work-delay.conf
diff --git a/tests/diag.sh b/tests/diag.sh
index 01b335ee..5c6a0ab8 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -5,8 +5,11 @@
# not always able to convey back states to the upper-level test driver
# begun 2009-05-27 by rgerhards
# This file is part of the rsyslog project, released under GPLv3
+#valgrind="valgrind --log-fd=1"
+#valgrind="valgrind --tool=drd --log-fd=1"
+#valgrind="valgrind --tool=helgrind --log-fd=1"
#set -o xtrace
-export RSYSLOG_DEBUG="debug nostdout"
+#export RSYSLOG_DEBUG="debug Xnostdout printmutexaction"
export RSYSLOG_DEBUGLOG="log"
case $1 in
'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason
@@ -22,7 +25,7 @@ case $1 in
;;
'startup') # start rsyslogd with default params. $2 is the config file name to use
# returns only after successful startup
- valgrind ../tools/rsyslogd -c4 -u2 -n -irsyslog.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 &
+ $valgrind ../tools/rsyslogd -c4 -u2 -n -irsyslog.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 &
$srcdir/diag.sh wait-startup
;;
'wait-startup') # wait for rsyslogd startup