aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2019-10-18 15:34:51 +0200
committerVratko Polak <vrpolak@cisco.com>2019-10-18 15:34:51 +0200
commit510f6d5140db4512ff00a43bf5b8d2ddd1f4a064 (patch)
treeb307d6c0471ae4f1b30a59c585ba16416f13d44e
parent4e9256f1c7d46949e5aeecae2e5b8aecc72f16e9 (diff)
Autogen checker: Fix difference reporting branch
Change-Id: I85da5ec38643524fa1af7ed7628025a4a52463f5 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
-rw-r--r--resources/libraries/bash/entry/check/autogen.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/resources/libraries/bash/entry/check/autogen.sh b/resources/libraries/bash/entry/check/autogen.sh
index 0164b65962..822c50c0ea 100644
--- a/resources/libraries/bash/entry/check/autogen.sh
+++ b/resources/libraries/bash/entry/check/autogen.sh
@@ -50,10 +50,11 @@ cp -rf "${CSIT_DIR}/tests"/* "${GENERATED_DIR}/tests_tmp"/
# I think archiving the diff is enough.
diff_cmd=("diff" "-dur" "${GENERATED_DIR}/tests_tmp" "${GENERATED_DIR}/tests")
-lines="$("${diff_cmd[@]}" | tee "autogen.log" | wc -l)" || die
+# Diff returns RC=1 if output is nonzero, so we do not die on the next line.
+lines="$("${diff_cmd[@]}" | tee "autogen.log" | wc -l)"
if [ "${lines}" != "0" ]; then
# TODO: Decide which text goes to stdout and which to stderr.
- warn "Autogen conflict diff nonzero lines: ${lines}"
+ warn "Autogen conflict, diff sees nonzero lines: ${lines}"
# TODO: Disable if output size does more harm than good.
cat "autogen.log" >&2
warn