diff options
author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-12-15 11:06:25 +0000 |
---|---|---|
committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-12-15 11:06:25 +0000 |
commit | dcf7d18f672f5241e7cdac2cca88f1a97271378a (patch) | |
tree | 179e0ac14c2d11b792fa0798a3714aa08b6a87c2 /tcwg_gnu-build.sh | |
parent | 5a80a7248f90c25f983f7412d2432f8f1ad26368 (diff) |
Revert "tcwg_{bmk,gnu,kernel}-build.sh: Update to not override passed rr[components]"
This reverts commit 5a80a7248f90c25f983f7412d2432f8f1ad26368.
Reason for revert: This was a bad idea.
Change-Id: Ib9deb1247ded5714cccc88baf5535892e78f5baa
Diffstat (limited to 'tcwg_gnu-build.sh')
-rwxr-xr-x | tcwg_gnu-build.sh | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh index 450e8a94..c7737f62 100755 --- a/tcwg_gnu-build.sh +++ b/tcwg_gnu-build.sh @@ -36,15 +36,20 @@ EOF # campaign: bootstrap, bootstrap_lto, check_binutils, .... type_of_test=${type_of_test-${ci_config[3]}} -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] ;; +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 esac # Use baseline branches by default. @@ -55,13 +60,6 @@ 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}" |