summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2019-02-19 11:40:04 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2019-02-19 11:40:04 +0000
commitecaa922692d868d9616ae53348d8b1160ef16de8 (patch)
tree899937bc242b0b27e26398bf23f73e7fd57c0876
parentfafb6d725bdfaac632ab0ff31c468b1665da1d91 (diff)
round-robin.sh: Fix asserts
Change-Id: I2e1887bc565c3b0423690c48c768b1eeaea33531
-rw-r--r--round-robin.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/round-robin.sh b/round-robin.sh
index caa6b47a..fe8a5974 100644
--- a/round-robin.sh
+++ b/round-robin.sh
@@ -433,7 +433,7 @@ $(cat ${rr[top_artifacts]}/results)"
# We saw strange behavior with base-artifacts/results not being updated
# or git-add'ed properly. Add a couple of asserts to catch such problems.
- if [ x"$(diff -rup -x .git ${rr[top_artifacts]}/ base-artifacts/ | wc -l)" != x"0" ] \
+ if [ x"$(diff -up ${rr[top_artifacts]}/results base-artifacts/results)" != x"" ] \
|| [ x"$amend" = x"" -a x"$(git -C base-artifacts diff HEAD HEAD^ -- results)" = x"" ]; then
cd base-artifacts
git status