Update run-tests shell usage, fixing all shellcheck warnings.

diff --git a/ChangeLog b/ChangeLog
index fbbac0cce9be85be8e5a7e72b1ea9308fe7a0439..8573c7862dc90b2ced3acddbdc6ebe0aa25c94ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-10-16  Niels Möller  <nisse@lysator.liu.se>
+
+       * run-tests: Cleanup, guided by shellcheck warnings. Use $()
+       rather than `` and $(()) rather than expr.
+
 2024-09-08  Niels Möller  <nisse@lysator.liu.se>
 
        From Brad Smith: Support elf_aux_info (OpenBSD and FreeBSD).

diff --git a/run-tests b/run-tests
index 44c8c39aa2a2dcc0dcdefc227b1864498653861c..5e06c5122181136afe15544dc838174ba3aba732 100755 (executable)
--- a/run-tests
+++ b/run-tests
@@ -23,7 +23,7 @@ debug='no'
 testflags=''
 
 if [ -z "$srcdir" ] ; then
-  srcdir=`pwd`
+  srcdir=$(pwd)
 fi
 
 export srcdir
@@ -66,15 +66,15 @@ find_program () {
 env_program () {
   if [ -x "$1" ] ; then
     if "$1"; then : ; else
-      echo FAIL: $1
+      echo "FAIL: $1"
       exit 1
     fi
   fi
 }
 
 test_program () {
-  testname=`basename "$1" .exe`
-  testname=`basename "$testname" -test`
+  testname=$(basename "$1" .exe)
+  testname=$(basename "$testname" -test)
   if [ -z "$EMULATOR" ] || head -1 "$1" | grep '^#!' > /dev/null; then
     "$1" $testflags
   else
@@ -82,21 +82,21 @@ test_program () {
   fi
   case "$?" in
       0)
-       echo PASS: $testname
-       all=`expr $all + 1`
+       echo "PASS: $testname"
+       all=$((all + 1))
        ;;
       77)
-       echo SKIP: $testname
+       echo "SKIP: $testname"
       ;;
       *)
-       echo FAIL: $testname
-       failed=`expr $failed + 1`
-       all=`expr $all + 1`
+       echo "FAIL: $testname"
+       failed=$((failed + 1))
+       all=$((all + 1))
        ;;
   esac
 }
 
-env_program `find_program setup-env`
+env_program "$(find_program setup-env)"
 
 while test $# != 0
 do
@@ -118,20 +118,20 @@ do
   shift
 done
 
-for f in "$@" ; do test_program `find_program "$f"`; done
+for f in "$@" ; do test_program "$(find_program "$f")"; done
 
-if [ $failed -eq 0 ] ; then
+if [ "$failed" -eq 0 ] ; then
   banner="All $all tests passed"
 else
   banner="$failed of $all tests failed"
 fi
-dashes=`echo "$banner" | sed s/./=/g`
+dashes=$(echo "$banner" | sed s/./=/g)
 echo "$dashes"
 echo "$banner"
 echo "$dashes"
 
-if [ "x$debug" = xno ] ; then
-  env_program `find_program teardown-env`
+if [ "$debug" = no ] ; then
+  env_program "$(find_program teardown-env)"
 fi
 
 [ "$failed" -eq 0 ]