diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2024-03-18 12:35:48 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2024-03-18 16:14:38 +0100 |
| commit | b7cde0f6a293fd07c66796fc07fa6aa95ed55519 (patch) | |
| tree | 81220bf1cfe32595f2659703d29611374aa13219 | |
| parent | 25590be470a334a25429ae6c5d4735f30f1da9c8 (diff) | |
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
| -rwxr-xr-x | contrib/jenkins.sh | 13 |
1 files changed, 11 insertions, 2 deletions
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 PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" 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 @@ $MAKE check \ || 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 |