diff options
| author | Sergio Martins <smartins@kde.org> | 2019-10-03 12:01:34 +0100 |
|---|---|---|
| committer | Sergio Martins <smartins@kde.org> | 2019-10-03 12:01:34 +0100 |
| commit | 8d85a409aea6945c805b166e86ab5a93056766f6 (patch) | |
| tree | 7fcb871d2631f96523b5e7b5f1e8a497a01ab180 | |
| parent | 5ae7f56d80fdc04edc26eb0bbef2a2ce8d034ab0 (diff) | |
docker: Always use LLVM_ROOT instead of CLAZY_PREFIX
This way we can use the same docker image to test several
llvm versions
| -rwxr-xr-x | tests/docker/build-clazy.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/docker/build-clazy.sh b/tests/docker/build-clazy.sh index bfd58583..77a880b3 100755 --- a/tests/docker/build-clazy.sh +++ b/tests/docker/build-clazy.sh @@ -13,12 +13,7 @@ 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 |