diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-09 19:19:25 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-09 19:19:25 +0200 |
| commit | 7a2dff608d7119accdd6679840987b4fb05f6054 (patch) | |
| tree | 03f095d181c063cb4329dd78ddb1a5d2d6c1e89a /tests | |
| parent | 9633ce1afcb3c3e44f969be0503360a4c0c75599 (diff) | |
| parent | d2d8cc9c1b65bedeafaa3a06ed53cbc8511be9a3 (diff) | |
| download | rsyslog-7a2dff608d7119accdd6679840987b4fb05f6054.tar.gz rsyslog-7a2dff608d7119accdd6679840987b4fb05f6054.tar.xz rsyslog-7a2dff608d7119accdd6679840987b4fb05f6054.zip | |
Merge branch 'nextmaster' of git+ssh://rger@git.adiscon.com/git/rsyslog into nextmaster
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rwxr-xr-x | tests/manytcp.sh | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 6d3c8725..87dca985 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -33,9 +33,11 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ cfg.sh ourtail_SOURCES = ourtail.c -tcpflood_SOURCES = tcpflood.c chkseq_SOURCES = chkseq.c +tcpflood_SOURCES = tcpflood.c +tcpflood_LDADD = $(SOL_LIBS) + nettester_SOURCES = nettester.c getline.c nettester_LDADD = $(SOL_LIBS) diff --git a/tests/manytcp.sh b/tests/manytcp.sh index b38245df..f0a3eb96 100755 --- a/tests/manytcp.sh +++ b/tests/manytcp.sh @@ -1,5 +1,6 @@ rm -f rsyslog.out.log # work file ../tools/rsyslogd -c4 -u2 -n -irsyslog.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/manytcp.conf & +sleep 1 echo "rsyslogd started with pid " `cat rsyslog.pid` ./tcpflood 127.0.0.1 13514 1000 20000 sleep 1 |