From 3622d4e423f01a1ba4b9f47da03e7223f858ecda Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Mon, 27 May 2019 03:44:40 +0200
Subject: [PATCH] Really ignore errors from the "fixme" test

---
 tests/fixme.sh | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/tests/fixme.sh b/tests/fixme.sh
index b7794e5..c3897de 100755
--- a/tests/fixme.sh
+++ b/tests/fixme.sh
@@ -41,7 +41,7 @@ TR="tr"
 #fixme
 _fixme()
 {
-	ret=0
+	res=0
 
 	$DATE
 	echo
@@ -81,40 +81,40 @@ _fixme()
 			($callback "$filename") 2>&1
 			if [ $? -ne 0 ]; then
 				echo "$PROGNAME: $filename: FAIL" 1>&2
-				ret=2
+				res=2
 			fi
 		done
 	done
-	return $ret
+	return $res
 }
 
 _fixme_asm()
 {
-	ret=0
+	res=0
 	filename="$1"
 
 	#warnings
 	$GREP -nH '/\*.*\(TODO\|XXX\)' "$filename"
 	#failures
-	$GREP -nH '/\*.*FIXME' "$filename" && ret=2
-	return $ret
+	$GREP -nH '/\*.*FIXME' "$filename" && res=2
+	return $res
 }
 
 _fixme_c()
 {
-	ret=0
+	res=0
 	filename="$1"
 
 	#warnings
 	$GREP -nH '/\(/\|\*\).*\(TODO\|XXX\)' "$filename"
 	#failures
-	$GREP -nH '/\(/\|\*\).*FIXME' "$filename" && ret=2
-	return $ret
+	$GREP -nH '/\(/\|\*\).*FIXME' "$filename" && res=2
+	return $res
 }
 
 _fixme_sh()
 {
-	ret=0
+	res=0
 	filename="$1"
 	#XXX avoid matching the regexp
 	comment="#"
@@ -122,21 +122,21 @@ _fixme_sh()
 	#warnings
 	$GREP -nH "$comment.*\\(TODO\\|XXX\\)" "$filename"
 	#failures
-	$GREP -nH "$comment.*FIXME" "$filename" && ret=2
-	return $ret
+	$GREP -nH "$comment.*FIXME" "$filename" && res=2
+	return $res
 }
 
 _fixme_xml()
 {
-	ret=0
+	res=0
 	filename="$1"
 
 	#XXX limited to a single line
 	#warnings
 	$GREP -nH '<!--.*\(TODO\|XXX\)' "$filename"
 	#failures
-	$GREP -nH '<!--.*FIXME' "$filename" && ret=2
-	return $ret
+	$GREP -nH '<!--.*FIXME' "$filename" && res=2
+	return $res
 }
 
 
@@ -189,6 +189,7 @@ fi
 [ $clean -ne 0 ] && exit 0
 
 exec 3>&1
+ret=0
 while [ $# -gt 0 ]; do
 	target="$1"
 	dirname="${target%/*}"
@@ -197,7 +198,8 @@ while [ $# -gt 0 ]; do
 	if [ -n "$dirname" -a "$dirname" != "$target" ]; then
 		$MKDIR -- "$dirname"				|| ret=$?
 	fi
-	_fixme > "$target"					|| exit 2
+	_fixme > "$target"					|| ret=$?
 done
 #XXX ignore errors
-exit 0
+ret=0
+exit $ret