diff options
author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-05-27 14:08:59 +0000 |
---|---|---|
committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-05-28 10:51:33 +0000 |
commit | cb9e011ff0b1d4412102a9e3a2a940a6605b2ade (patch) | |
tree | 39d7b846a40a6d4b69a74457e4ae1da768870a74 | |
parent | ccb12e1c5c404822b067fed6892858e646c72161 (diff) |
round-robin.sh: Simplify "check" logic of build_abe()
Make "build_abe FOO" build FOO and make "build_abe check_FOO" run
FOO's testsuites. This also makes tcwg_gnu's bisections more
efficient, since we will ignore FOO's build problems in "check"
configurations.
Change-Id: I71c644e801828b94d880bed7fe440e4db3ffb40b
-rw-r--r-- | round-robin.sh | 17 | ||||
-rwxr-xr-x | tcwg_gnu-build.sh | 14 |
2 files changed, 13 insertions, 18 deletions
diff --git a/round-robin.sh b/round-robin.sh index e1fa13e7..957ce44c 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -248,11 +248,6 @@ build_abe () set -euf -o pipefail local component="$1" - local action_type="build" - - if [ x"${2-}" = x"check" ]; then - action_type="check" - fi local project stage action check check=false @@ -260,16 +255,8 @@ build_abe () # Check if component starts with an action (eg. "check") case "$component" in check_*) - component=${component#check_} - if [ x$action_type = x"check" ]; then - check=true - fi - ;; - *) - # For non-check configs, action_type=="check" should be nop - if [ x$action_type = x"check" ]; then - return - fi + component="${component#check_}" + check=true ;; esac diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh index 3a55b548..03aae496 100755 --- a/tcwg_gnu-build.sh +++ b/tcwg_gnu-build.sh @@ -75,7 +75,7 @@ case "${rr[mode]}" in ;; "bisect") case "$(print_single_updated_component)" in - binutils|gcc) default_start_at="build_abe-$type_of_test" ;; + binutils|gcc) default_start_at="build_abe-${type_of_test#check_}" ;; *) assert false ;; esac default_finish_at="check_regression" @@ -133,8 +133,16 @@ no_regression_p () run_step stop_on_fail -1 reset_artifacts run_step stop_on_fail x prepare_abe -run_step skip_on_fail 0 build_abe ${type_of_test} -run_step skip_on_fail 1 build_abe ${type_of_test} "check" +case "$type_of_test" in + check_*) + run_step skip_on_fail 0 build_abe ${type_of_test#check_} + run_step skip_on_fail 1 build_abe ${type_of_test} + ;; + *) + run_step skip_on_fail 0 true + run_step skip_on_fail 1 build_abe ${type_of_test} + ;; +esac run_step reset_on_fail x check_regression run_step stop_on_fail x update_baseline run_step stop_on_fail x push_baseline |