diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-25 11:19:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-25 11:19:50 +0200 |
| commit | 33035d9213ef29e848afabe14a1d0297eaf58319 (patch) | |
| tree | 5e1075b565ceb7551c08a174cb06bf956b3a9cbd | |
| parent | 2005d52a8babf01c5a6d276e726185c8a932ac1f (diff) | |
| parent | ba839bf17200f51a9860940910536fba2282161e (diff) | |
| download | rsyslog-33035d9213ef29e848afabe14a1d0297eaf58319.tar.gz rsyslog-33035d9213ef29e848afabe14a1d0297eaf58319.tar.bz2 rsyslog-33035d9213ef29e848afabe14a1d0297eaf58319.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/diag.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index f604c1cd..ee4e7f31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -294,6 +294,7 @@ DISTCHECK_CONFIGURE_FLAGS= --enable-gssapi_krb5 \ --enable-pmsnare \ --enable-mmsnmptrapd \ --enable-elasticsearch \ + --enable-valgrind \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) # temporarily disable these checks for make distcheck 2012-09-06 rgerhards # --enable-extended-tests \ diff --git a/tests/diag.sh b/tests/diag.sh index 2fdcbfb9..7883d93b 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -109,6 +109,7 @@ case $1 in echo Shutting down instance 2 fi $srcdir/diag.sh wait-queueempty $2 + ./msleep 100 # wait 100 milliseconds kill `cat rsyslog$2.pid` # note: we do not wait for the actual termination! ;; |