From 86da62d21217a6a55ee0e8f923949bf70dbe385f Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@cs.fau.de>
Date: Mon, 12 Apr 2021 18:02:36 +0200
Subject: [PATCH] [check-iwyu] Do not fail right away if IWYU_TOOL fails
Since only newer versions of IWYU_TOOL fail with an exit code, we have
to disable -e around the IWYU_TOOL invocation. Otherwise we would not
print IWYU_LOG.
---
tools/check-iwyu | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tools/check-iwyu b/tools/check-iwyu
index 4efd45c6..67b431ea 100755
--- a/tools/check-iwyu
+++ b/tools/check-iwyu
@@ -64,10 +64,23 @@ else
echo "WARNING: ${IWYU_TOOL} does not support --load"
fi
+set +e
${IWYU_TOOL} ${IWYU_TOOL_ARGS[@]} \
-- \
-Xiwyu --mapping_file="${MESON_SOURCE_ROOT}/iwyu-mappings.imp" \
> "${IWYU_LOG}"
+set -e
+# Only newer versions of IWYU_TOOL fail with an exit code (IWYU >
+# 0.15, since commit
+# https://github.com/include-what-you-use/include-what-you-use/commit/a7499e4a2b416592777cc4c33fca746d091af738). Therefore
+# we have to manually see if this IWYU_TOOL run failed with an error
+# exit code.
+# shellcheck: disable=SC2181
+if [[ ${?} -gt 0 ]]; then
+ echoerr "IWYU exited with ${?}"
+ cat "${IWYU_LOG}"
+ exit $?
+fi
if [[ ! -s "${IWYU_LOG}" ]]; then
echoerr "${IWYU_LOG} is empty (or non existent)"
--
GitLab