summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2020-12-15 10:07:40 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2020-12-15 10:07:40 +0000
commit5a80a7248f90c25f983f7412d2432f8f1ad26368 (patch)
tree2f6e3b93d589140c89e034c2f9929193c9313020
parentc7038281ea8468d13e1e505673ed7b0e5aeec182 (diff)
tcwg_{bmk,gnu,kernel}-build.sh: Update to not override passed rr[components]
Change-Id: I1b2dbfb294e72bab2a14cbb91a4dec03b58a37fb
-rwxr-xr-xtcwg_bmk-build.sh18
-rwxr-xr-xtcwg_gnu-build.sh30
-rwxr-xr-xtcwg_kernel-build.sh10
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.