diff --git a/tests/docker/build-clazy.sh b/tests/docker/build-clazy.sh index bfd5858..77a880b 100755 --- a/tests/docker/build-clazy.sh +++ b/tests/docker/build-clazy.sh @@ -1,24 +1,19 @@ # This is the script that runs inside the docker container and builds clazy BRANCH=$1 J_FLAG=$2 CLAZY_PREFIX=$3 IGNORE_CHECKS=$4 LLVM_ROOT=$5 if [ "$IGNORE_CHECKS" = "none" ] then IGNORE_CHECKS="" else IGNORE_CHECKS=" --exclude ${IGNORE_CHECKS} " fi -if [ "$5" = "none" ] -then - unset LLVM_ROOT -fi - -export PATH=$CLAZY_PREFIX/bin:$PATH -export LD_LIBRARY_PATH=$CLAZY_PREFIX/lib:$CLAZY_PREFIX/lib64:$LD_LIBRARY_PATH +export PATH=$LLVM_ROOT/bin:$PATH +export LD_LIBRARY_PATH=$LLVM_ROOT/lib:$LLVM_ROOT/lib64:$LD_LIBRARY_PATH -cd /root/clazy && git fetch && git checkout origin/$BRANCH && cmake -DCMAKE_INSTALL_PREFIX=$CLAZY_PREFIX -DCMAKE_BUILD_TYPE=RelWithDebInfo . && make $J_FLAG && make install && cd tests && ./run_tests.py $IGNORE_CHECKS +cd /root/clazy && git fetch && git checkout origin/$BRANCH && cmake -DCMAKE_INSTALL_PREFIX=$LLVM_ROOT -DCMAKE_BUILD_TYPE=RelWithDebInfo . && make $J_FLAG && make install && cd tests && ./run_tests.py $IGNORE_CHECKS