diff options
| author | David Spickett <david.spickett@linaro.org> | 2020-04-23 11:10:08 +0100 |
|---|---|---|
| committer | David Spickett <david.spickett@linaro.org> | 2020-04-28 13:13:46 +0000 |
| commit | 6273fc478b9c95c4ae8d42c9021f9428b1d43811 (patch) | |
| tree | 9564b82cc9e90dc4886835d30cbdea35453b1f53 /round-robin.sh | |
| parent | 0ce72e970e6cbb6c39469b503cdf65510f4f99d8 (diff) | |
Shellcheck fixes round 3
Now using the version that's
present in the bionic images.
Meaning we have more warnings
but can also set the minimum
level to ignore a lot of them.
Fix the check for whether
shellcheck supports --severity.
(we have pipefail on, but we
expect shellcheck to fail in
this case)
Change-Id: I296b8554591b7d327c75393e3924184abc6512b7
Diffstat (limited to 'round-robin.sh')
| -rw-r--r-- | round-robin.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/round-robin.sh b/round-robin.sh index 9d067c5e..4093340b 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -169,8 +169,8 @@ clone_repo () # developers without ssh keys on Linaro git servers to reproduce builds # in --mode "baseline". local read_only="true" - if [ x"${rr[${project}_branch]}" != x"baseline" -a \ - x"${rr[mode]}" = x"jenkins-full" ]; then + if [ x"${rr[${project}_branch]}" != x"baseline" ] && \ + [ x"${rr[mode]}" = x"jenkins-full" ]; then read_only=false fi @@ -329,7 +329,7 @@ build_abe () shift done - if [ x"$project" = x"gcc" -a $# != 0 ]; then + if [ x"$project" = x"gcc" ] && [ $# != 0 ]; then stage="$stage $*" fi @@ -579,7 +579,7 @@ check_regression () if [ $score -lt 0 ] 2>/dev/null; then # Don't bisect uninteresting regressions. : - elif [ x"$single_component" = x"" -o x"${rr[mode]}" = x"bisect" ]; then + elif [ x"$single_component" = x"" ] || [ x"${rr[mode]}" = x"bisect" ]; then local -a update_components while read -a update_components; do |