From e41ad4d0084eca4a463970c0cc58867d92779cbc Mon Sep 17 00:00:00 2001
From: Max <msuraev@sysmocom.de>
Date: Thu, 18 Jan 2018 17:37:18 +0100
Subject: jenkins: move make invocation into shared function
Change-Id: Ied8c1085b8bee2cc4fa65592e805838b8cdae287
---
contrib/jenkins_amd64.sh | 6 +++---
contrib/jenkins_arm.sh | 3 +--
contrib/jenkins_common.sh | 4 ++++
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/contrib/jenkins_amd64.sh b/contrib/jenkins_amd64.sh
index d336f0a0..ff1cfdc3 100755
--- a/contrib/jenkins_amd64.sh
+++ b/contrib/jenkins_amd64.sh
@@ -15,9 +15,9 @@ build() {
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 acdbe3cc..45795966 100755
--- a/contrib/jenkins_arm.sh
+++ b/contrib/jenkins_arm.sh
@@ -16,8 +16,7 @@ build() {
--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 a6ffe7f7..fa1d544b 100644
--- a/contrib/jenkins_common.sh
+++ b/contrib/jenkins_common.sh
@@ -26,3 +26,7 @@ prep_build() {
mkdir -p "$_build_dir"
cd "$_build_dir"
}
+
+run_make() {
+ $MAKE $PARALLEL_MAKE check || cat-testlogs.sh
+}
--
cgit v1.2.3