testbench nitfixes: modernize arithmetic expressions

detected by shellcheck tool

tests/imfile-logrotate.sh

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

tests/imfile-wildcards-dirs-multi.sh

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

tests/imfile-wildcards-dirs-multi2.sh

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

tests/imfile-wildcards-dirs-multi3.sh

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

tests/imfile-wildcards-dirs-multi4.sh

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

tests/imfile-wildcards-dirs-multi5-polling.sh

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

tests/imfile-wildcards-dirs-multi5.sh

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

tests/imfile-wildcards-dirs2.sh

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

tests/loop.sh

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

tests/mysql-actq-mt-withpause-extended.sh

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

tests/omprog-output-capture-mt.sh

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

tests/omprog-single-instance-outfile.sh

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

tests/omprog-single-instance.sh

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

tests/omprog-transactions-failed-commits.sh

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

tests/omprog-transactions-failed-messages.sh

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

tests/omprog-transactions.sh

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