From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 9 Nov 2021 11:05:07 +0000 (+0100)
Subject: Fix autogen.sh checker
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=33bc5d2fd8af4e6d397b06e29a30fa5556ae3490;hp=c5f202b8fa105fa8701fae26d04b808c7529e33a;ds=sidebyside

Fix autogen.sh checker

Previously, the FAIL message was not printed.

Change-Id: Id3fc6c126edd42b55cec73294696a0426a73d634
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/resources/libraries/bash/entry/check/autogen.sh b/resources/libraries/bash/entry/check/autogen.sh
index 4ff214c260..d7cd8e0dbd 100644
--- a/resources/libraries/bash/entry/check/autogen.sh
+++ b/resources/libraries/bash/entry/check/autogen.sh
@@ -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")
-# 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}"