diff options
| -rwxr-xr-x | contrib/jenkins_amd64.sh | 6 | ||||
| -rwxr-xr-x | contrib/jenkins_arm.sh | 3 | ||||
| -rw-r--r-- | 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 +} |