From 0fa77938a799e7167244dc9ed9f03e5dbe5c862d Mon Sep 17 00:00:00 2001
From: Michal Berger <michal.berger@intel.com>
Date: Tue, 20 Dec 2022 11:59:30 +0100
Subject: [PATCH] autobuild: Refactor doxygen version check

Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: I053dedc537d4f58db42cbad9480c38ef520d1d9b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16028
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Kamil Godzwon <kamilx.godzwon@intel.com>
---
 test/common/autobuild_common.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/test/common/autobuild_common.sh b/test/common/autobuild_common.sh
index 92b4d8495..e6fcddf38 100755
--- a/test/common/autobuild_common.sh
+++ b/test/common/autobuild_common.sh
@@ -292,19 +292,13 @@ _build_doc() {
 		if [[ "$doxygenv" == "1.8.20" ]]; then
 			# Doxygen 1.8.20 produces false positives, see:
 			# https://github.com/doxygen/doxygen/issues/7948
-			if grep -vE '\\ilinebr' "$out"/doxygen.log; then
-				echo "Doxygen errors found!"
-				exit 1
-			fi
+			grep -vE '\\ilinebr'
 		elif [[ "$doxygenv" == "1.9.5" ]]; then
 			# Doxygen 1.9.5 produces false positives, see:
 			# https://github.com/doxygen/doxygen/issues/9552 and
 			# https://github.com/doxygen/doxygen/issues/9678
-			if grep -vE '\\ifile|@param' "$out"/doxygen.log; then
-				echo "Doxygen errors found!"
-				exit 1
-			fi
-		fi
+			grep -vE '\\ifile|@param'
+		fi < "$out/doxygen.log" && echo "Doxygen errors found!" && return 1
 
 		echo "Doxygen $doxygenv detected. No warnings except false positives, continuing the test"
 	fi