Fix autogen.sh checker 06/34406/3
authorVratko Polak <vrpolak@cisco.com>
Tue, 9 Nov 2021 11:05:07 +0000 (12:05 +0100)
committerVratko Polak <vrpolak@cisco.com>
Wed, 10 Nov 2021 09:19:10 +0000 (09:19 +0000)
Previously, the FAIL message was not printed.

Change-Id: Id3fc6c126edd42b55cec73294696a0426a73d634
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
resources/libraries/bash/entry/check/autogen.sh

index 4ff214c..d7cd8e0 100644 (file)
@@ -50,8 +50,8 @@ 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")
 # I think archiving the diff is enough.
 
 diff_cmd=("diff" "-dur" "${GENERATED_DIR}/tests_tmp" "${GENERATED_DIR}/tests")
-# 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)"
+# Diff returns RC=1 if output is nonzero.
+lines="$("${diff_cmd[@]}" | tee "autogen.log" | wc -l || true)"
 if [ "${lines}" != "0" ]; then
     # TODO: Decide which text goes to stdout and which to stderr.
     warn "Autogen conflict, diff sees nonzero lines: ${lines}"
 if [ "${lines}" != "0" ]; then
     # TODO: Decide which text goes to stdout and which to stderr.
     warn "Autogen conflict, diff sees nonzero lines: ${lines}"