diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 15:13:33 +0200 |
| commit | ada87cbaefecff9d32f3d008876f2eec59335ded (patch) | |
| tree | c52339b2e2c2cbfc7a7152bf1cc65912b46932c2 /tests/random.sh | |
| parent | 11ab3c800043b036132b0fc96d20bcba637a72b6 (diff) | |
| parent | 9039fad4019cb9a0f96eb296835476841b453dd3 (diff) | |
| download | rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.gz rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.tar.bz2 rsyslog-ada87cbaefecff9d32f3d008876f2eec59335ded.zip | |
Merge branch 'v4-devel' into master
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/manual.html
runtime/debug.c
runtime/rsyslog.h
tests/Makefile.am
tests/diag.sh
tests/nettester.c
tools/syslogd.c
Diffstat (limited to 'tests/random.sh')
| -rwxr-xr-x | tests/random.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/random.sh b/tests/random.sh index 79f704c7..d1f392d3 100755 --- a/tests/random.sh +++ b/tests/random.sh @@ -17,4 +17,4 @@ source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done proces source $srcdir/diag.sh wait-shutdown # and wait for it to terminate # we do not check anything yet, the point is if rsyslog survived ;) # TODO: check for exit message, but we'll notice an abort anyhow, so not that important -#source $srcdir/diag.sh exit +source $srcdir/diag.sh exit |