diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-10-10 11:17:07 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-10-11 08:48:25 +0000 |
| commit | b7ee25a420f3c28e650906a90a4cf7beac093ced (patch) | |
| tree | 6c9df77ea1c771bb862a5c71ba5266329d204751 /tcwg_bmk-build.sh | |
| parent | bc1af4540944982179cc2527995c5b84334b14ec (diff) | |
jenkins-helpers.sh: Handle paths in run_step's arguments
When we pass ${rr[top_artifacts]}/results_id to "run_step ... benchmark"
we end up with artifacts directory for this step something like
artifacts/11-benchmark-.../home/$USER/<path>/.../results_id/ -- because
we include all arguments to the run_step in the pretty name of the step.
This patch makes $pretty_step name absorb arguments up to "--" in its
name, and also flattens any paths by changing "/" to "-".
Change-Id: I700818409337b9884284d785641edae4db419462
Diffstat (limited to 'tcwg_bmk-build.sh')
| -rwxr-xr-x | tcwg_bmk-build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index b1493a0f..0cdf24ee 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -106,7 +106,7 @@ benchmark () set -euf -o pipefail local cflags="$1" - local results_id_file="$2" + local results_id_file="$3" rm -rf $(pwd)/bin mkdir $(pwd)/bin @@ -392,13 +392,13 @@ case "${rr[toolchain]}" in esac case "${#cflags[@]}" in 2) - run_step skip_on_fail -1 benchmark "${cflags[0]}" ${rr[top_artifacts]}/results_id-1 - run_step skip_on_fail 0 benchmark "${cflags[1]}" ${rr[top_artifacts]}/results_id-2 + run_step skip_on_fail -1 benchmark "${cflags[0]}" -- ${rr[top_artifacts]}/results_id-1 + run_step skip_on_fail 0 benchmark "${cflags[1]}" -- ${rr[top_artifacts]}/results_id-2 rr[no_regression_p]=no_regression_vs_p run_step reset_on_fail x check_regression ;; 1) - run_step skip_on_fail 0 benchmark "${cflags[0]}" ${rr[top_artifacts]}/results_id + run_step skip_on_fail 0 benchmark "${cflags[0]}" -- ${rr[top_artifacts]}/results_id rr[no_regression_p]=no_regression_to_base_p run_step reset_on_fail x check_regression ;; |