jenkins: move make invocation into shared function

Change-Id: Ied8c1085b8bee2cc4fa65592e805838b8cdae287
This commit is contained in:
Max 2018-01-18 17:37:18 +01:00 committed by Harald Welte
parent 8e8378a84d
commit e41ad4d008
3 changed files with 8 additions and 5 deletions

View File

@ -15,9 +15,9 @@ build() {
prep_build "$src_dir" "$build_dir" prep_build "$src_dir" "$build_dir"
"$src_dir"/configure --enable-static $ENABLE_SANITIZE CFLAGS="-Werror" CPPFLAGS="-Werror" "$src_dir"/configure --disable-silent-rules --enable-static $ENABLE_SANITIZE CFLAGS="-Werror" CPPFLAGS="-Werror"
$MAKE V=1 $PARALLEL_MAKE check \
|| cat-testlogs.sh run_make
} }
# verify build in dir other than source tree # verify build in dir other than source tree

View File

@ -16,8 +16,7 @@ build() {
--disable-shared \ --disable-shared \
CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror" CFLAGS="-Os -ffunction-sections -fdata-sections -nostartfiles -nodefaultlibs -Werror"
$MAKE $PARALLEL_MAKE \ run_make
|| cat-testlogs.sh
} }
# verify build in dir other than source tree # verify build in dir other than source tree

View File

@ -26,3 +26,7 @@ prep_build() {
mkdir -p "$_build_dir" mkdir -p "$_build_dir"
cd "$_build_dir" cd "$_build_dir"
} }
run_make() {
$MAKE $PARALLEL_MAKE check || cat-testlogs.sh
}