diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-12 12:39:10 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-12 12:39:10 +0200 |
| commit | 2a2a9716f7ee0debd192e75785e347f4e4af0b4d (patch) | |
| tree | 8d8fef67d1c7bdf11bd193f3ce93dae8e9530ba4 /tests/diag.sh | |
| parent | 3b63b155ed5e4d58858baa3d6f07293099d8a4e5 (diff) | |
| parent | 20607ba1695b99838db7bdf809b22cf52bbdf5ce (diff) | |
| download | rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.gz rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.xz rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.zip | |
Merge branch 'master-newconf'
Conflicts:
ChangeLog
tools/omfile.c
Diffstat (limited to 'tests/diag.sh')
| -rwxr-xr-x | tests/diag.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/diag.sh b/tests/diag.sh index 9fd878a4..0c7942da 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -10,8 +10,8 @@ #valgrind="valgrind --tool=helgrind --log-fd=1" #valgrind="valgrind --tool=exp-ptrcheck --log-fd=1" #set -o xtrace -#export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction stdout" -#export RSYSLOG_DEBUGLOG="log" +export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction stdout" +export RSYSLOG_DEBUGLOG="log" case $1 in 'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason cp $srcdir/testsuites/diag-common.conf diag-common.conf |