rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-12 19:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

testbench nitfixes: modernize arithmetic expressions

Browse Source 
detected by shellcheck tool
This commit is contained in:
Rainer Gerhards 2019-01-07 09:46:57 +01:00
parent 3519b0df55
commit 30f571a4de
No known key found for this signature in database
GPG Key ID: 0CB6B2A8BE80B499
16 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/imfile-logrotate.sh
View File

@ -69,7 +69,7 @@ ls -l $RSYSLOG_DYNNAME.input*
echo ls ${RSYSLOG_DYNNAME}.spool: echo ls ${RSYSLOG_DYNNAME}.spool:
ls -l ${RSYSLOG_DYNNAME}.spool ls -l ${RSYSLOG_DYNNAME}.spool
let msgcount="2* $TESTMESSAGES" msgcount=$((2* TESTMESSAGES))
wait_file_lines $RSYSLOG_OUT_LOG $msgcount $RETRIES wait_file_lines $RSYSLOG_OUT_LOG $msgcount $RETRIES
shutdown_when_empty # shut down rsyslogd when done processing messages shutdown_when_empty # shut down rsyslogd when done processing messages

2
tests/imfile-wildcards-dirs-multi.sh
View File

@ -67,7 +67,7 @@ do
ls -d $RSYSLOG_DYNNAME.input.* ls -d $RSYSLOG_DYNNAME.input.*
# Check correct amount of input files each time # Check correct amount of input files each time
let IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j)) IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j))
content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT
# Delete all but first! # Delete all but first!

2
tests/imfile-wildcards-dirs-multi2.sh
View File

@ -69,7 +69,7 @@ do
ls -d $RSYSLOG_DYNNAME.input.* ls -d $RSYSLOG_DYNNAME.input.*
# Check correct amount of input files each time # Check correct amount of input files each time
let IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j)) IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j))
content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT
# Delete all but first! # Delete all but first!

2
tests/imfile-wildcards-dirs-multi3.sh
View File

@ -74,7 +74,7 @@ do
ls -d $RSYSLOG_DYNNAME.input.* ls -d $RSYSLOG_DYNNAME.input.*
# Check correct amount of input files each time # Check correct amount of input files each time
let IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j)) IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j))
content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT
# Delete all but first! # Delete all but first!

4
tests/imfile-wildcards-dirs-multi4.sh
View File

@ -3,7 +3,7 @@
. ${srcdir:=.}/diag.sh init . ${srcdir:=.}/diag.sh init
export IMFILEINPUTFILES="1" export IMFILEINPUTFILES="1"
export IMFILEINPUTFILESSTEPS="5" export IMFILEINPUTFILESSTEPS="5"
#export IMFILEINPUTFILESALL=$(($IMFILEINPUTFILES * $IMFILEINPUTFILESSTEPS)) #export IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * IMFILEINPUTFILESSTEPS))
export IMFILECHECKTIMEOUT="60" export IMFILECHECKTIMEOUT="60"
generate_conf generate_conf
@ -73,7 +73,7 @@ do
ls -d $RSYSLOG_DYNNAME.input.* ls -d $RSYSLOG_DYNNAME.input.*
# Check correct amount of input files each time # Check correct amount of input files each time
let IMFILEINPUTFILESALL=$(($IMFILEINPUTFILES * $j)) IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j))
content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT
# Delete all but first! # Delete all but first!

2
tests/imfile-wildcards-dirs-multi5-polling.sh
View File

@ -59,7 +59,7 @@ for j in $(seq 1 $IMFILEINPUTFILESSTEPS); do
ls -d $RSYSLOG_DYNNAME.input.* ls -d $RSYSLOG_DYNNAME.input.*
# Check correct amount of input files each time # Check correct amount of input files each time
let IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j)) IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j))
content_check_with_count "HEADER msgnum:000000" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT content_check_with_count "HEADER msgnum:000000" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT
# Delete all but first! # Delete all but first!
for i in $(seq 1 $IMFILEINPUTFILES); for i in $(seq 1 $IMFILEINPUTFILES);

2
tests/imfile-wildcards-dirs-multi5.sh
View File

@ -60,7 +60,7 @@ do
ls -d $RSYSLOG_DYNNAME.input.* ls -d $RSYSLOG_DYNNAME.input.*
# Check correct amount of input files each time # Check correct amount of input files each time
let IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j)) IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j))
content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT
# Delete all but first! # Delete all but first!

2
tests/imfile-wildcards-dirs2.sh
View File

@ -65,7 +65,7 @@ do
ls -d $RSYSLOG_DYNNAME.input.* ls -d $RSYSLOG_DYNNAME.input.*
# Check correct amount of input files each time # Check correct amount of input files each time
let IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j)) IMFILEINPUTFILESALL=$((IMFILEINPUTFILES * j))
content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT content_check_with_count "HEADER msgnum:00000000:" $IMFILEINPUTFILESALL $IMFILECHECKTIMEOUT
# Delete all but first! # Delete all but first!

6
tests/loop.sh
View File

@ -15,14 +15,14 @@ while [ $RUN -le $MAXRUN ]; do
echo "###### RUN: " $RUN "success" $SUCCESS "fail" $FAIL echo "###### RUN: " $RUN "success" $SUCCESS "fail" $FAIL
$1 $1
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
let FAIL+=1 ((FAIL++))
echo "FAIL!" echo "FAIL!"
#vi work #vi work
exit 1 exit 1
else else
let SUCCESS+=1 ((SUCCESS++))
fi fi
let RUN+=1 ((RUN++))
done done
echo echo
echo "Nbr success: " $SUCCESS echo "Nbr success: " $SUCCESS

2
tests/mysql-actq-mt-withpause-extended.sh
View File

@ -23,7 +23,7 @@ mysql --user=rsyslog --password=testbench < ${srcdir}/testsuites/mysql-truncate.
startup startup
let "strtnum = 0" strtnum=0
for i in {1..50} for i in {1..50}
do do
echo "running iteration $i, startnum: $strtnum" echo "running iteration $i, startnum: $strtnum"

2
tests/omprog-output-capture-mt.sh
View File

@ -70,7 +70,7 @@ wait_shutdown
line_num=0 line_num=0
while IFS= read -r line; do while IFS= read -r line; do
let "line_num++" ((line_num++))
if [[ ${#line} != $LINE_LENGTH ]]; then if [[ ${#line} != $LINE_LENGTH ]]; then
echo "intermingled line in captured output: line: $line_num, length: ${#line} (expected: $LINE_LENGTH)" echo "intermingled line in captured output: line: $line_num, length: ${#line} (expected: $LINE_LENGTH)"
echo "$line" echo "$line"

2
tests/omprog-single-instance-outfile.sh
View File

@ -53,7 +53,7 @@ wait_shutdown
EXPECTED_LINE_LENGTH=34 # example line: '[stderr] Received msgnum:00009880:' EXPECTED_LINE_LENGTH=34 # example line: '[stderr] Received msgnum:00009880:'
line_num=0 line_num=0
while IFS= read -r line; do while IFS= read -r line; do
let "line_num++" ((line_num++))
if [[ $line_num == 1 ]]; then if [[ $line_num == 1 ]]; then
if [[ "$line" != "[stderr] Starting" ]]; then if [[ "$line" != "[stderr] Starting" ]]; then
echo "unexpected first line in captured stderr: $line" echo "unexpected first line in captured stderr: $line"

2
tests/omprog-single-instance.sh
View File

@ -52,7 +52,7 @@ wait_shutdown
EXPECTED_LINE_LENGTH=25 # example line: 'Received msgnum:00009880:' EXPECTED_LINE_LENGTH=25 # example line: 'Received msgnum:00009880:'
line_num=0 line_num=0
while IFS= read -r line; do while IFS= read -r line; do
let "line_num++" ((line_num++))
if [[ $line_num == 1 ]]; then if [[ $line_num == 1 ]]; then
if [[ "$line" != "Starting" ]]; then if [[ "$line" != "Starting" ]]; then
echo "unexpected first line in output: $line" echo "unexpected first line in output: $line"

2
tests/omprog-transactions-failed-commits.sh
View File

@ -117,7 +117,7 @@ while IFS= read -r line; do
fi fi
status_expected=true; status_expected=true;
fi fi
let "line_num++" ((line_num++))
done < $RSYSLOG_OUT_LOG done < $RSYSLOG_OUT_LOG
if [[ -z "$error" && "$transaction_state" != "NONE" ]]; then if [[ -z "$error" && "$transaction_state" != "NONE" ]]; then

2
tests/omprog-transactions-failed-messages.sh
View File

@ -118,7 +118,7 @@ while IFS= read -r line; do
fi fi
status_expected=true; status_expected=true;
fi fi
let "line_num++" ((line_num++))
done < $RSYSLOG_OUT_LOG done < $RSYSLOG_OUT_LOG
if [[ -z "$error" && "$transaction_state" != "NONE" ]]; then if [[ -z "$error" && "$transaction_state" != "NONE" ]]; then

2
tests/omprog-transactions.sh
View File

@ -104,7 +104,7 @@ while IFS= read -r line; do
fi fi
status_expected=true; status_expected=true;
fi fi
let "line_num++" ((line_num++))
done < $RSYSLOG_OUT_LOG done < $RSYSLOG_OUT_LOG
if [[ -z "$error" && "$transaction_state" != "NONE" ]]; then if [[ -z "$error" && "$transaction_state" != "NONE" ]]; then