From bdaaf38b8d5fa3c813228eb7078dc5d6dad078e5 Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Wed, 11 Aug 2021 20:06:39 +0000
Subject: tcwg_bmk-build.sh, tcwg_kernel-build.sh: Fix shellcheck warnings

Change-Id: I5878531b2187e0c9ad972d7fcdf643b65ee94ebc
---
 tcwg_bmk-build.sh    | 11 +----------
 tcwg_kernel-build.sh | 12 +-----------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh
index 2c8e90f4..925c6836 100755
--- a/tcwg_bmk-build.sh
+++ b/tcwg_bmk-build.sh
@@ -11,31 +11,25 @@ scripts=$(dirname $0)
 convert_args_to_variables "$@"
 
 obligatory_variables rr[ci_project] rr[ci_config] ssh_host ssh_port
+declare -A rr
 
 # Execution mode: baseline, bisect, jenkins-full
-# shellcheck disable=SC2154
 rr[mode]="${rr[mode]-baseline}"
 
 # Set custom revision for one of the projects, and use baseline revisions
 # for all other projects.
-# shellcheck disable=SC2154
 rr[baseline_branch]="${rr[baseline_branch]-linaro-local/ci/${rr[ci_project]}/${rr[ci_config]}}"
-# shellcheck disable=SC2154
 rr[update_baseline]="${rr[update_baseline]-update}"
-# shellcheck disable=SC2154
 rr[top_artifacts]="${rr[top_artifacts]-$(pwd)/artifacts}"
 
 # Set metric to perf by default.
-# shellcheck disable=SC2154
 rr[metric]="${rr[metric]-perf}"
 
 # {toolchain_name}-{toolchain_ver}-{target}-{bmk}-{cflags}
 IFS=- read -a ci_config <<EOF
 ${rr[ci_config]}
 EOF
-# shellcheck disable=SC2154
 rr[toolchain]=${rr[toolchain]-${ci_config[0]}}
-# shellcheck disable=SC2154
 rr[target]=${rr[target]-${ci_config[2]}}
 benchmarks=("${benchmarks[@]-${ci_config[3]}}")
 if [ x"${benchmarks[*]}" = x"default" ]; then
@@ -117,7 +111,6 @@ esac
 
 case "${rr[toolchain]}" in
     llvm)
-      # shellcheck disable=SC2154
       rr[components]="binutils gcc linux glibc llvm" ;;
     gnu)
       rr[components]="binutils gcc linux glibc" ;;
@@ -646,7 +639,6 @@ tcwg_bmk_breakup_updated_components ()
     fi
     )
 }
-# shellcheck disable=SC2154
 rr[breakup_updated_components]=tcwg_bmk_breakup_updated_components
 
 run_step stop_on_fail -10 reset_artifacts
@@ -683,7 +675,6 @@ case "${#cflags[@]}" in
 	run_step skip_on_fail 0 benchmark -- "${cflags[1]}" ${rr[top_artifacts]}/results_id-2
 	# Set final "build" score to "1" for compatibility with older results
 	run_step skip_on_fail 1 true
-	# shellcheck disable=SC2154
 	rr[no_regression_p]=no_regression_vs_p
 	run_step reset_on_fail x check_regression
 	;;
diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh
index 1b0010da..b912f57f 100755
--- a/tcwg_kernel-build.sh
+++ b/tcwg_kernel-build.sh
@@ -11,38 +11,29 @@ scripts=$(dirname $0)
 convert_args_to_variables "$@"
 
 obligatory_variables rr[ci_config]
+declare -A rr
 
 # Execution mode: baseline, bisect, jenkins-full
-# shellcheck disable=SC2154
 rr[mode]="${rr[mode]-baseline}"
 
 # Set custom revision for one of the projects, and use baseline revisions
 # for all other projects.
-# shellcheck disable=SC2154
 rr[ci_project]="${rr[ci_project]-tcwg_kernel}"
-# shellcheck disable=SC2154
 rr[baseline_branch]="${rr[baseline_branch]-linaro-local/ci/${rr[ci_project]}/${rr[ci_config]}}"
-# shellcheck disable=SC2154
 rr[update_baseline]="${rr[update_baseline]-update}"
-# shellcheck disable=SC2154
 rr[top_artifacts]="${rr[top_artifacts]-$(pwd)/artifacts}"
 
 # {toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}
 IFS=- read -a ci_config <<EOF
 ${rr[ci_config]}
 EOF
-# shellcheck disable=SC2154
 rr[toolchain]=${rr[toolchain]-${ci_config[0]}}
-# shellcheck disable=SC2154
 rr[release]=${rr[release]-${ci_config[1]}}
-# shellcheck disable=SC2154
 rr[target]=${rr[target]-${ci_config[2]}}
-# shellcheck disable=SC2154
 rr[linux_config]=${rr[linux_config]-${ci_config[4]}}
 
 case "${rr[toolchain]}" in
     llvm)
-        # shellcheck disable=SC2154
         rr[components]="binutils llvm linux qemu" ;;
     gnu)
         rr[components]="binutils gcc linux qemu" ;;
@@ -303,7 +294,6 @@ tcwg_kernel_breakup_updated_components ()
     fi
     )
 }
-# shellcheck disable=SC2154
 rr[breakup_updated_components]=tcwg_kernel_breakup_updated_components
 
 run_step stop_on_fail -10 reset_artifacts
-- 
cgit v1.2.3