[MERGED] libosmocore[master]: jenkins: move make invocation into shared function

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: jenkins: move make invocation into shared function
......................................................................


jenkins: move make invocation into shared function

Change-Id: Ied8c1085b8bee2cc4fa65592e805838b8cdae287
---
M contrib/jenkins_amd64.sh
M contrib/jenkins_arm.sh
M contrib/jenkins_common.sh
3 files changed, 8 insertions(+), 5 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/contrib/jenkins_amd64.sh b/contrib/jenkins_amd64.sh
index d336f0a..ff1cfdc 100755
--- a/contrib/jenkins_amd64.sh
+++ b/contrib/jenkins_amd64.sh
@@ -15,9 +15,9 @@
 
     prep_build "$src_dir" "$build_dir"
 
-    "$src_dir"/configure --enable-static $ENABLE_SANITIZE CFLAGS="-Werror" CPPFLAGS="-Werror"
-    $MAKE V=1 $PARALLEL_MAKE check \
-        || cat-testlogs.sh
+    "$src_dir"/configure  --disable-silent-rules --enable-static $ENABLE_SANITIZE CFLAGS="-Werror" CPPFLAGS="-Werror"
+
+    run_make
 }
 
 # verify build in dir other than source tree
diff --git a/contrib/jenkins_arm.sh b/contrib/jenkins_arm.sh
index acdbe3c..4579596 100755
--- a/contrib/jenkins_arm.sh
+++ b/contrib/jenkins_arm.sh
@@ -16,8 +16,7 @@
 	--disable-shared \
 	CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror"
 
-    $MAKE $PARALLEL_MAKE \
-        || cat-testlogs.sh
+    run_make
 }
 
 # verify build in dir other than source tree
diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh
index a6ffe7f..fa1d544 100644
--- a/contrib/jenkins_common.sh
+++ b/contrib/jenkins_common.sh
@@ -26,3 +26,7 @@
     mkdir -p "$_build_dir"
     cd "$_build_dir"
 }
+
+run_make() {
+    $MAKE $PARALLEL_MAKE check || cat-testlogs.sh
+}

-- 
To view, visit https://gerrit.osmocom.org/5874
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied8c1085b8bee2cc4fa65592e805838b8cdae287
Gerrit-PatchSet: 3
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder