osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33680 ) Change subject: contrib/jenkins.sh: deduplicate configure flags ...................................................................... contrib/jenkins.sh: deduplicate configure flags Prepare to add meas-related flags to CONFIG in future patches. Related: OS#5173 Change-Id: I5685aa0bcb77286d1cd89cc9c8fee58991597446 --- M contrib/jenkins.sh 1 file changed, 16 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 695af3a..a89f7d5 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -60,9 +60,9 @@ osmo-build-dep.sh osmo-mgw # Additional configure options and depends -CONFIG="" +CONFIG="--enable-external-tests --enable-werror" if [ "$WITH_MANUALS" = "1" ]; then - CONFIG="--enable-manuals" + CONFIG="$CONFIG --enable-manuals" fi set +x @@ -75,12 +75,12 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG +./configure --enable-sanitize $CONFIG $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || exit_tar_workspace LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests --enable-werror $CONFIG" \ + DISTCHECK_CONFIGURE_FLAGS="$CONFIG" \ $MAKE $PARALLEL_MAKE distcheck \ || exit_tar_workspace -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5685aa0bcb77286d1cd89cc9c8fee58991597446 Gerrit-Change-Number: 33680 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged