From 5a80a7248f90c25f983f7412d2432f8f1ad26368 Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Tue, 15 Dec 2020 10:07:40 +0000
Subject: tcwg_{bmk,gnu,kernel}-build.sh: Update to not override passed
 rr[components]

Change-Id: I1b2dbfb294e72bab2a14cbb91a4dec03b58a37fb
---
 tcwg_bmk-build.sh    | 18 +++++++++---------
 tcwg_gnu-build.sh    | 30 ++++++++++++++++--------------
 tcwg_kernel-build.sh | 10 +++++-----
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh
index 516e26e2..00dd1fcd 100755
--- a/tcwg_bmk-build.sh
+++ b/tcwg_bmk-build.sh
@@ -95,15 +95,15 @@ esac
 # We need to test revisions during that time period for performance regressions.
 gcc_override_configure+=("--set" "gcc_override_configure=--disable-libsanitizer")
 
-case "${rr[toolchain]}" in
-    llvm)
-      # shellcheck disable=SC2154
-      rr[components]="binutils gcc glibc llvm" ;;
-    gnu)
-      rr[components]="binutils gcc glibc" ;;
-    gnu_eabi)
-      rr[components]="binutils gcc newlib" ;;
-    *) assert_with_msg "Unknown toolchain \"${rr[toolchain]}\"" false ;;
+case "${rr[components]-unset}:${rr[toolchain]}" in
+    unset:llvm)
+	rr[components]="binutils gcc glibc llvm" ;;
+    unset:gnu)
+	rr[components]="binutils gcc glibc" ;;
+    unset:gnu_eabi)
+	rr[components]="binutils gcc newlib" ;;
+    *)
+	obligatory_variables rr[components] ;;
 esac
 
 # Use baseline branches by default.
diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh
index c7737f62..450e8a94 100755
--- a/tcwg_gnu-build.sh
+++ b/tcwg_gnu-build.sh
@@ -36,20 +36,15 @@ EOF
 # campaign: bootstrap, bootstrap_lto, check_binutils, ....
 type_of_test=${type_of_test-${ci_config[3]}}
 
-case "$type_of_test" in
-    *_binutils)
-	rr[target]="${rr[target]-native}"
-	rr[components]="binutils"
-	;;
-    *bootstrap*)
-	rr[target]="${rr[target]-native}"
-	rr[components]="gcc"
-	;;
-    *_cross)
-	rr[target]="${rr[target]-${ci_config[2]}}"
-	rr[components]="binutils gcc glibc qemu"
-	;;
-    *) assert_with_msg "Unknown type_of_test: $type_of_test" false
+case "${rr[components]-unset}:$type_of_test" in
+    unset:*_binutils)
+	rr[components]="binutils" ;;
+    unset:*bootstrap*)
+	rr[components]="gcc" ;;
+    unset:*_cross)
+	rr[components]="binutils gcc glibc qemu" ;;
+    *)
+	obligatory_variables rr[components] ;;
 esac
 
 # Use baseline branches by default.
@@ -60,6 +55,13 @@ for c in ${rr[components]}; do
     fi
 done
 
+case "$type_of_test" in
+    *_cross)
+	rr[target]="${rr[target]-${ci_config[2]}}" ;;
+    *)
+	rr[target]="${rr[target]-native}" ;;
+esac
+
 start_at="${start_at-default}"
 finish_at="${finish_at-default}"
 verbose="${verbose-true}"
diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh
index e4c446d6..4dd662a8 100755
--- a/tcwg_kernel-build.sh
+++ b/tcwg_kernel-build.sh
@@ -40,13 +40,13 @@ 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
+case "${rr[components]-unset}:${rr[toolchain]}" in
+    unset:llvm)
         rr[components]="llvm linux qemu" ;;
-    gnu)
+    unset:gnu)
         rr[components]="binutils gcc linux qemu" ;;
-    *) assert_with_msg "Unknown toolchain \"${rr[toolchain]}\"" false ;;
+    *)
+	obligatory_variables rr[components] ;;
 esac
 
 # Use baseline branches by default.
-- 
cgit v1.2.3