diff options
| -rw-r--r-- | round-robin.sh | 21 | ||||
| -rwxr-xr-x | tcwg_gnu-build.sh | 9 |
2 files changed, 24 insertions, 6 deletions
diff --git a/round-robin.sh b/round-robin.sh index 1fb7e7ee..fe793d81 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -206,8 +206,16 @@ build_abe () local component="$1" - local project stage action - action="build" + local project stage action check + check=false + + # Check if component starts with an action (eg. "check") + case "$component" in + check-*) + component=${component#check-} + check=true + ;; + esac case "$component" in stage1) @@ -260,6 +268,13 @@ build_abe () ;; esac + action="--build $project" + # When checking a component we still need to force its build, + # otherwise ABE does nothing. + if $check; then + action="$action --check $project" + fi + # Use our custom sources for everything, but kernel headers. local custom_abe_src_opt="" local git_dir="$project" @@ -306,7 +321,7 @@ build_abe () # Run "./abe.sh --build $project". ./abe.sh \ - --$action $project \ + $action \ $target_opt \ --extraconfigdir config/master \ $custom_abe_src_opt \ diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh index 2aeed4be..f8b11ec1 100755 --- a/tcwg_gnu-build.sh +++ b/tcwg_gnu-build.sh @@ -25,7 +25,9 @@ IFS=- read -a ci_config <<EOF ${rr[ci_config]} EOF rr[target]="native" -bootstrap_config=${bootstrap_config-${ci_config[3]}} +# type_of_test contains the type of action to perform in this test +# campaign: bootstrap, bootstrap_lto, check-binutils, .... +type_of_test=${bootstrap_config-${ci_config[3]}} rr[components]="gcc" # Use baseline branches by default. @@ -54,7 +56,8 @@ case "${rr[mode]}" in ;; "bisect") case "$(print_single_updated_component)" in - gcc) default_start_at="build_abe-$bootstrap_config" ;; + binutils) default_start_at="build_abe-check-binutils" ;; + gcc) default_start_at="build_abe-$type_of_test" ;; *) assert false ;; esac default_finish_at="check_regression" @@ -101,7 +104,7 @@ no_regression_p () run_step stop_on_fail -10 reset_artifacts run_step stop_on_fail x prepare_abe -run_step skip_on_fail -5 build_abe ${bootstrap_config} +run_step skip_on_fail -5 build_abe ${type_of_test} run_step reset_on_fail x check_regression run_step stop_on_fail x update_baseline run_step stop_on_fail x push_baseline |