osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36330?usp=email ) Change subject: contrib/jenkins: make configure args diff friendly ...................................................................... contrib/jenkins: make configure args diff friendly Removing new lines in DISTCHECK_CONFIGURE_FLAGS again is needed, as it otherwise fails with: enable-sanitize /bin/bash: line 1: enable-sanitize: command not found Change-Id: I049af384eccdb6f8e5b305ca35de106eeaca3fa8 --- M contrib/jenkins.sh 1 file changed, 25 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 990e6f4..f896b86 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -85,7 +85,16 @@ export LD_LIBRARY_PATH="$inst/lib" export PATH="$inst/bin:$PATH" -CONFIG="--enable-sanitize --enable-werror --with-uhd --with-usrp1 --with-lms --with-ipc --with-mstrx $INSTR" +CONFIG=" + --enable-sanitize + --enable-werror + --with-ipc + --with-lms + --with-mstrx + --with-uhd + --with-usrp1 + $INSTR +" # Additional configure options and depends if [ "$WITH_MANUALS" = "1" ]; then @@ -109,7 +118,7 @@ || cat-testlogs.sh if arch | grep -v -q arm; then - DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE $PARALLEL_MAKE distcheck \ + DISTCHECK_CONFIGURE_FLAGS="$(echo $CONFIG | tr -d '\n')" $MAKE $PARALLEL_MAKE distcheck \ || cat-testlogs.sh fi -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36330?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I049af384eccdb6f8e5b305ca35de106eeaca3fa8 Gerrit-Change-Number: 36330 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged