summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-25 14:58:23 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-25 14:58:23 +0100
commitec883905c13920de0bc33e5bdd0a75c80535b55c (patch)
tree20d136261457dc65b3f219e7a8508e2d4e78bf19 /tests
parent7e1060295a63242bc22394b6873de6e6db2b4765 (diff)
downloadrsyslog-ec883905c13920de0bc33e5bdd0a75c80535b55c.tar.gz
rsyslog-ec883905c13920de0bc33e5bdd0a75c80535b55c.tar.xz
rsyslog-ec883905c13920de0bc33e5bdd0a75c80535b55c.zip
testbench improved to run on Solaris
Diffstat (limited to 'tests')
-rwxr-xr-xtests/complex1.sh5
-rwxr-xr-xtests/diag.sh7
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/complex1.sh b/tests/complex1.sh
index b5dc2c9d..7395bf21 100755
--- a/tests/complex1.sh
+++ b/tests/complex1.sh
@@ -10,12 +10,13 @@ source $srcdir/diag.sh init
export RSYSLOG_DEBUG="debug nostdout"
export RSYSLOG_DEBUGLOG="log"
source $srcdir/diag.sh startup complex1.conf
-# send 30,000 messages of 400 bytes plus header max, via three dest ports
+# send 40,000 messages of 400 bytes plus header max, via three dest ports
source $srcdir/diag.sh tcpflood -m40000 -rd400 -P129 -f5 -n3 -c15 -i1
sleep 2 # due to large messages, we need this time for the tcp receiver to settle...
source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
source $srcdir/diag.sh wait-shutdown # and wait for it to terminate
ls rsyslog.out.*.log
-zcat rsyslog.out.*.log > rsyslog.out.log
+source $srcdir/diag.sh setzcat # find out which zcat to use
+$ZCAT rsyslog.out.*.log > rsyslog.out.log
source $srcdir/diag.sh seq-check 1 40000 -E
source $srcdir/diag.sh exit
diff --git a/tests/diag.sh b/tests/diag.sh
index 173219da..383cd818 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -128,5 +128,12 @@ case $1 in
exit 1
fi
;;
+ 'setzcat') # find out name of zcat tool
+ if [ `uname` == SunOS ]; then
+ ZCAT=gzcat
+ else
+ ZCAT=zcat
+ fi
+ ;;
*) echo "invalid argument" $1
esac