From 5142ccf1a4cfefed4ead986c8667632b4b38f779 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Fri, 21 Aug 2015 22:56:56 -0400 Subject: [PATCH] check_contrib: additional rules are given by arguments. Signed-off-by: Jean Privat --- misc/jenkins/check_contrib.sh | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/misc/jenkins/check_contrib.sh b/misc/jenkins/check_contrib.sh index 4b481e3..fafeb92 100755 --- a/misc/jenkins/check_contrib.sh +++ b/misc/jenkins/check_contrib.sh @@ -17,8 +17,13 @@ # The script must be run from the root Nit directory. # # various .xml junit file will be generated in the root directory for jenkins. +# +# Arguments will be additional `make` rules to execute. eg. +# +# check_contrib.sh check android projects=`echo lib/*/Makefile examples/*/Makefile contrib/*/Makefile` +rules=$* failed= for p in $projects; do @@ -26,20 +31,19 @@ for p in $projects; do name=`basename "$dir"` echo "*** make $dir ***" if misc/jenkins/unitrun.sh "cmd-$name-make" make -C "$dir"; then - # Make OK, is there a `check` rule? - make -C "$dir" check -n 2>/dev/null || continue - echo "*** makecheck $dir ***" - if misc/jenkins/unitrun.sh "cmd-$name-makecheck" make -C "$dir" check; then - : - else - failed="$failed $name-check" - fi - + # 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 done -grep '