tests: remove legacy backticks

Same as for cqfd, see https://www.shellcheck.net/wiki/SC2006 for rationale.
savoirfairelinux · Mar 12, 2023 · 3e04f1d · 3e04f1d
1 parent bc09b02
commit 3e04f1d
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 26 deletions.
diff --git a/tests/00-setup b/tests/00-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 
 jtest_prepare "create a test skeleton in temporary directory"
 

diff --git a/tests/01-cqfd_init b/tests/01-cqfd_init
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 
 cd $TDIR/
 
@@ -18,7 +18,7 @@ fi
 ################################################################################
 # 'cqfd init' with a nonexistent Dockerfile should fail
 ################################################################################
-cqfdrc_old=`mktemp`
+cqfdrc_old=$(mktemp)
 jtest_prepare "init with a nonexisting dockerfile shall fail"
 cp -f .cqfdrc $cqfdrc_old
 sed -i -e "s/\[build\]/[build]\ndistro='thisshouldfail'/" .cqfdrc

diff --git a/tests/03-cqfd_error b/tests/03-cqfd_error
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 
 ################################################################################
 # Running cqfd with an unknown argument shall fail

diff --git a/tests/03-cqfd_help b/tests/03-cqfd_help
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 
 ################################################################################
 # 'cqfd help' shall be an accepted command
 ################################################################################
 jtest_prepare "cqfd help shall exit normally"
-TEST=`mktemp`
+TEST=$(mktemp)
 
 if ! $TDIR/.cqfd/cqfd help >$TEST; then
 	jtest_result fail

diff --git a/tests/03-cqfd_version b/tests/03-cqfd_version
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 
 ################################################################################
 # 'cqfd version' shall be an accepted command
 ################################################################################
 jtest_prepare "cqfd version shall exit normally"
-TEST=`mktemp`
+TEST=$(mktemp)
 
 if ! $TDIR/.cqfd/cqfd version >$TEST; then
 	jtest_result fail

diff --git a/tests/05-cqfd_init_alt_ext b/tests/05-cqfd_init_alt_ext
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cd $TDIR/
 
 ################################################################################

diff --git a/tests/05-cqfd_init_flavor b/tests/05-cqfd_init_flavor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 flavor="foo"
 
@@ -9,7 +9,7 @@ cd $TDIR/
 ################################################################################
 # 'cqfd init' with different flavor makes a different container
 ################################################################################
-cqfdrc_old=`mktemp`
+cqfdrc_old=$(mktemp)
 cp -f .cqfdrc $cqfdrc_old
 sed -i -e "s/\[foo\]/[foo]\ndistro='centos'/" .cqfdrc
 

diff --git a/tests/05-cqfd_run b/tests/05-cqfd_run
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 test_file="a/cqfd_a.txt"
 

diff --git a/tests/05-cqfd_run_c b/tests/05-cqfd_run_c
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 test_file="a/cqfd_a.txt"
 test_run_c_file="test_run_c.txt"

diff --git a/tests/05-cqfd_run_c_flavor b/tests/05-cqfd_run_c_flavor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 flavor="foo"
 test_file=$flavor

diff --git a/tests/05-cqfd_run_command b/tests/05-cqfd_run_command
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 test_file="file.$RANDOM"
 

diff --git a/tests/05-cqfd_run_config b/tests/05-cqfd_run_config
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 confdir=$TDIR/.config/dir
 flavor="foo"

diff --git a/tests/05-cqfd_run_extra_env b/tests/05-cqfd_run_extra_env
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 
 cd $TDIR/

diff --git a/tests/05-cqfd_run_extra_groups b/tests/05-cqfd_run_extra_groups
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 
 cd $TDIR/

diff --git a/tests/05-cqfd_run_extra_hosts b/tests/05-cqfd_run_extra_hosts
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 getent_cmd="getent hosts 1.2.3.4"
 

diff --git a/tests/05-cqfd_run_flavor b/tests/05-cqfd_run_flavor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 flavor="foo"
 

diff --git a/tests/05-cqfd_run_home_env_var b/tests/05-cqfd_run_home_env_var
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 
 cd $TDIR/

diff --git a/tests/05-cqfd_run_spaces_in_path b/tests/05-cqfd_run_spaces_in_path
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 
 cd $TDIR/

diff --git a/tests/05-cqfd_run_tty b/tests/05-cqfd_run_tty
@@ -3,7 +3,7 @@
 # This test ensures cqfd works when not invoked from a tty (this is the case
 # when running from a CI system for example).
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 
 ################################################################################

diff --git a/tests/06-cqfd_release b/tests/06-cqfd_release
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. `dirname $0`/jtest.inc "$1"
+. "$(dirname $0)"/jtest.inc "$1"
 cqfd="$TDIR/.cqfd/cqfd"
 
 cd $TDIR/
@@ -119,7 +119,7 @@ rm -rf "${tmp_dir}"
 jtest_prepare "build.archive can template filenames"
 
 export CTEST=foobar
-d3=`date --rfc-3339='date'`
+d3=$(date --rfc-3339='date')
 echo 'archive=cqfd-%D3-$CTEST.tar.xz' >> .cqfdrc
 
 # Generate the release archive

diff --git a/tests/jtest.inc b/tests/jtest.inc
@@ -74,7 +74,7 @@ jtest_log()
 		;;
 	esac
 
-	echo -e "\e[${color}m[`date +%T`|$level] $@\e[0m"
+	echo -e "\e[${color}m[$(date +%T)|$level] $@\e[0m"
 }
 
 # jtest_prepare() - prepare next test
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,7 +74,7 @@ jtest_log() @@
     		;;
     	esac
-    	echo -e "\e[${color}m[`date +%T`|$level] $@\e[0m"
+    	echo -e "\e[${color}m[$(date +%T)|$level] $@\e[0m"
     }
     # jtest_prepare() - prepare next test
@@ Expand Down @@