X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fliburcu%2Fbuild.sh;h=76f8d3cc60389672146dd1a4c4d2c6a783d1b942;hb=befee704a53c9f232a2133a28b0ca5f46458fc99;hp=5eeb71b931a7ff0a4d746ac8d55c472c8cd37921;hpb=1d56e325ac199eb068729afbb04b3e954cb23061;p=lttng-ci.git diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh index 5eeb71b..76f8d3c 100755 --- a/scripts/liburcu/build.sh +++ b/scripts/liburcu/build.sh @@ -169,11 +169,12 @@ sol11-i386) export MAKE=gmake export TAR=gtar export NPROC=nproc - export PATH="$PATH:/usr/perl5/bin" + export PATH="/opt/csw/bin:$PATH:/usr/perl5/bin" export LD_ALTEXEC=/usr/bin/gld export LD=/usr/bin/gld export PYTHON="python3" export PYTHON_CONFIG="python3-config" + export PKG_CONFIG_PATH="/usr/lib/pkgconfig" ;; macosx) @@ -331,6 +332,13 @@ fi # Copy tap logs for the jenkins tap parser before cleaning the build dir rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap" +# The test suite prior to 0.11 did not produce TAP logs +if verlt "$PACKAGE_VERSION" "0.11"; then + mkdir -p "$WORKSPACE/tap/no-log" + echo "1..1" > "$WORKSPACE/tap/no-log/tests.log" + echo "ok 1 - Test suite doesn't support logging" >> "$WORKSPACE/tap/no-log/tests.log" +fi + # Clean the build directory $MAKE clean