diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-20 16:03:51 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-20 16:03:51 +0200 |
| commit | 534e07d738fc5c7f5464ab94a010cc7113dfad2c (patch) | |
| tree | 389432aabff3f72aee014452f7b449f41e829315 /tests/diag.sh | |
| parent | 527edddb4646c24fa9a587601cd90d7a57a1fcf0 (diff) | |
| parent | 74000ea71eb47c19653e0cd7bbffb83d913c3923 (diff) | |
| download | rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.tar.gz rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.tar.xz rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.zip | |
Merge branch 'v4-devel' into master
Conflicts:
plugins/imsolaris/imsolaris.c
tests/Makefile.am
Diffstat (limited to 'tests/diag.sh')
| -rwxr-xr-x | tests/diag.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/diag.sh b/tests/diag.sh index 06512d4a..b81e4eb6 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -59,9 +59,9 @@ case $1 in 'wait-queueempty') # wait for main message queue to be empty. $2 is the instance. if [ "$2" == "2" ] then - echo WaitMainQueueEmpty | java -classpath $abs_top_builddir DiagTalker + echo WaitMainQueueEmpty | ./diagtalker else - echo WaitMainQueueEmpty | java -classpath $abs_top_builddir DiagTalker 13501 + echo WaitMainQueueEmpty | ./diagtalker fi ;; 'shutdown-when-empty') # shut rsyslogd down when main queue is empty. $2 is the instance. @@ -83,7 +83,7 @@ case $1 in ;; 'injectmsg') # inject messages via our inject interface (imdiag) echo injecting $3 messages - echo injectmsg $2 $3 $4 $5 | java -classpath $abs_top_builddir DiagTalker + echo injectmsg $2 $3 $4 $5 | ./diagtalker # TODO: some return state checking? (does it really make sense here?) ;; 'check-mainq-spool') # check if mainqueue spool files exist, if not abort (we just check .qi). |