tcwg_{bmk,gnu,kernel}-build.sh: Update to not override passed rr[components]

Change-Id: I1b2dbfb294e72bab2a14cbb91a4dec03b58a37fb

1 files changed, 16 insertions, 14 deletions

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}"