From: Jean Privat <jean@pryen.org>
Date: Wed, 16 Sep 2015 13:09:44 +0000 (-0400)
Subject: check_contrib: only make given targets.
X-Git-Tag: v0.7.8~16^2~1
X-Git-Url: http://nitlanguage.org

check_contrib: only make given targets.

So this avoid doing a full desktop build only when a specific build is required (eg. android-release)

A special case is made for `all` that falls back as the default,

Signed-off-by: Jean Privat <jean@pryen.org>
---

diff --git a/misc/jenkins/check_contrib.sh b/misc/jenkins/check_contrib.sh
index fafeb92..df81660 100755
--- a/misc/jenkins/check_contrib.sh
+++ b/misc/jenkins/check_contrib.sh
@@ -29,19 +29,22 @@ failed=
 for p in $projects; do
 	dir=`dirname "$p"`
 	name=`basename "$dir"`
-	echo "*** make $dir ***"
-	if misc/jenkins/unitrun.sh "cmd-$name-make" make -C "$dir"; then
-		# Make OK. Check additional rules if they exists
-		for rule in $rules; do
-			make -C "$dir" $rule -n 2>/dev/null ||
-				continue
-			echo "*** make$rule $dir ***"
-			misc/jenkins/unitrun.sh "cmd-$name-make$rule" make -C "$dir" $rule ||
-				failed="$failed $name-$rule"
-		done
-	else
-		failed="$failed $name"
-	fi
+	echo "### in $dir ###"
+	# Check each rules, if they exists
+	for rule in $rules; do
+		make -C "$dir" $rule -n >/dev/null 2>/dev/null || {
+			# Special case for `all` that falls back as the default target
+			if [ "$rule" = "all" ]; then
+				echo "*** make -C $dir ***"
+				misc/jenkins/unitrun.sh "cmd-$name-make" make -C "$dir" ||
+					failed="$failed $name"
+			fi
+			continue
+		}
+		echo "*** make $rule -C $dir ***"
+		misc/jenkins/unitrun.sh "cmd-$name-make$rule" make -C "$dir" $rule ||
+			failed="$failed $name-$rule"
+	done
 done
 grep '<error message' *-make*.xml
 if test -n "$failed"; then