diff options
author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-12-11 15:03:32 +0000 |
---|---|---|
committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-12-12 09:44:22 +0000 |
commit | fab3817fc1b36ee01137499095036fd5f0919dbd (patch) | |
tree | c41375b5de82f8fa83c3cd2b6d7953430ed5514c | |
parent | 10313a0fd0b1bbabea8faabef45b628cdd04f2c5 (diff) |
Fix handling of $top_artifacts
Make handling of $top_artifacts same as all other rr[] variables
Change-Id: I9343217bf819bd46fa8d418c6549c4be32e4afd3
-rwxr-xr-x | tcwg_kernel-bisect.sh | 2 | ||||
-rwxr-xr-x | tcwg_kernel-build.sh | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tcwg_kernel-bisect.sh b/tcwg_kernel-bisect.sh index 855ba3e7..410429da 100755 --- a/tcwg_kernel-bisect.sh +++ b/tcwg_kernel-bisect.sh @@ -38,7 +38,7 @@ if $confirm_failure; then @@ build-manifest.sh --mode "baseline" \ --current_rev "$bad_rev" \ - ==rr[top_artifacts] "$artifacts/build-bad" \ + --top_artifacts "$artifacts/build-bad" \ --verbose "$verbose" & res=0 && wait $! || res=$? diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh index ee8fbaa8..875c6216 100755 --- a/tcwg_kernel-build.sh +++ b/tcwg_kernel-build.sh @@ -29,7 +29,7 @@ reset_baseline="${reset_baseline-false}" start_at="${start_at-default}" finish_at="${finish_at-default}" target="${target-native}" -rr[top_artifacts]="${rr[top_artifacts]-$(pwd)/artifacts}" +top_artifacts="$top_artifacts-$(pwd)/artifacts}" verbose="${verbose-true}" verbose2="${verbose2-false}" @@ -37,7 +37,7 @@ set -u if $verbose2; then set -x; fi -trap "eval \"echo ERROR at \${FUNCNAME[0]}:\${BASH_LINENO[0]}\" > ${rr[top_artifacts]}/failures" EXIT +trap "eval \"echo ERROR at \${FUNCNAME[0]}:\${BASH_LINENO[0]}\" > $top_artifacts/failures" EXIT if [ x"$target" = x"native" ]; then target=$(uname -m) @@ -94,7 +94,7 @@ else base_artifacts_opt="" fi -run_step_init "$start_at" "$finish_at" "${rr[top_artifacts]}" "$base_artifacts_opt" "$verbose" +run_step_init "$start_at" "$finish_at" "$top_artifacts" "$base_artifacts_opt" "$verbose" rr[current_project]="$current_project" rr[current_rev]="$current_rev" @@ -104,6 +104,7 @@ rr[mode]="$mode" rr[reset_baseline]="$reset_baseline" rr[target]="$target" rr[toolchain]="$toolchain" +rr[top_artifacts]="$top_artifacts" # Reset artifacts to an empty state. ${rr[top_artifacts]}/results is the most # important artifact, since it records the metric of how successful the build |