tcwg_bmk-build.sh: Fix parsing of ci_project/ci_config

Change-Id: I34f3c70d48abddaf98dcf5e29531ff329753e180

1 files changed, 11 insertions, 14 deletions

diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh
index a353efe..d5408a9 100755
--- a/tcwg_bmk-build.sh
+++ b/tcwg_bmk-build.sh
@@ -61,19 +61,20 @@ tcwg_bmk_hw ()
     echo $hw_tag
 }
 
-# {toolchain_name}-{toolchain_ver}-{target}-{bmk}-{cflags}
-IFS=- read -a ci_config <<EOF
-${rr[ci_config]}
+# ${ci_project}-${ci_config} format is :
+#  'tcwg_bmk-#{PROFILE_NAME}-#{BMK}-#{TOOLCHAIN}-#{TARGET}-{toolchain_ver}-{cflags}'
+IFS=- read -a ci_pjt_cfg <<EOF
+${rr[ci_project]}-${rr[ci_config]}
 EOF
 
-rr[toolchain]=${rr[toolchain]-${ci_config[0]}}
-rr[target]=${rr[target]-${ci_config[2]}}
-benchmarks=("${benchmarks[@]-${ci_config[3]}}")
+rr[toolchain]=${rr[toolchain]-${ci_pjt_cfg[3]}}
+rr[target]=${rr[target]-${ci_pjt_cfg[4]}}
+benchmarks=("${benchmarks[@]-${ci_pjt_cfg[2]}}")
 if [ x"${benchmarks[*]}" = x"default" ]; then
-    benchmarks=("${ci_config[3]}")
+    benchmarks=("${ci_pjt_cfg[2]}")
 fi
 
-cflags="${cflags--${ci_config[4]}}"
+cflags="${cflags--${ci_pjt_cfg[6]}}"
 
 metric_id="${metric_id-cflags}"
 
@@ -103,15 +104,11 @@ esac
 # - and new format :
 #     ci_project: 'tcwg_bmk-#{PROFILE_NAME}-#{BMK}'
 #     ci_config: '#{TOOLCHAIN}-#{TARGET}-{toolchain_ver}-{cflags}'
-IFS=- read -a arr <<EOF
-${rr[ci_project]}-${rr[ci_config]}
-EOF
-
 hw=$(tcwg_bmk_hw)
 hw=${hw%_32} ; hw=${hw%_64}
 
-rr[old_format_ci_project]="tcwg_bmk_${arr[3]}_${hw}"
-rr[old_format_ci_config]="${arr[3]}-${arr[5]}-${arr[4]}-${arr[2]}-${arr[6]}"
+rr[old_format_ci_project]="tcwg_bmk_${ci_pjt_cfg[3]}_${hw}"
+rr[old_format_ci_config]="${ci_pjt_cfg[3]}-${ci_pjt_cfg[5]}-${ci_pjt_cfg[4]}-${ci_pjt_cfg[2]}-${ci_pjt_cfg[6]}"
 rr[old_format_baseline_branch]="${rr[old_format_ci_project]}/${rr[old_format_ci_config]}"
 
 # -----------------------------------------------------------------------