From 661074102d457f715191f0f083f4cfebe630876e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 1 Jul 2020 13:49:04 +0200 Subject: [PATCH] testsuite: use a variable to set the version --- debian/tests/integration-test-suite-test | 32 +++++++++++++----------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/debian/tests/integration-test-suite-test b/debian/tests/integration-test-suite-test index 4a688379..c5e14c6b 100755 --- a/debian/tests/integration-test-suite-test +++ b/debian/tests/integration-test-suite-test @@ -2,6 +2,8 @@ set -e +LLVM_VERSION=11 + # this is taken from libjsoncpp package # Presence of $ADTTMP implies that someone will handle cleanup for us, so we # can avoid duplicating the effort (signal handling, etc.) here. @@ -17,21 +19,21 @@ cd "$ADTTMP" mkdir build cd build -cmake -DLIT=/usr/lib/llvm-10/build/utils/lit/lit.py \ - -DCLANG_BINARY=/usr/bin/clang-10 \ - -DCLANGXX_BINARY=/usr/bin/clang++-10 \ - -DCLANG_TIDY_BINARY=/usr/bin/clang-tidy-10 \ - -DCLANG_FORMAT_BINARY=/usr/bin/clang-format-10 \ - -DLLD_BINARY=/usr/bin/lld-10 \ - -DLLDB_BINARY=/usr/bin/lldb-10 \ - -DLLVMCONFIG_BINARY=/usr/bin/llvm-config-10 \ - -DOPT_BINARY=/usr/bin/opt-10 \ - -DSCANBUILD=/usr/bin/scan-build-10 \ - -DCLANG_TIDY_BINARY=/usr/bin/clang-tidy-10 \ - -DSCANVIEW=/usr/bin/scan-view-10 \ - -DLLVMNM=/usr/bin/llvm-nm-10 \ - -DLLVMPROFDATA=/usr/bin/llvm-profdata-10 \ +cmake -DLIT=/usr/lib/llvm-$LLVM_VERSION/build/utils/lit/lit.py \ + -DCLANG_BINARY=/usr/bin/clang-$LLVM_VERSION \ + -DCLANGXX_BINARY=/usr/bin/clang++-$LLVM_VERSION \ + -DCLANG_TIDY_BINARY=/usr/bin/clang-tidy-$LLVM_VERSION \ + -DCLANG_FORMAT_BINARY=/usr/bin/clang-format-$LLVM_VERSION \ + -DLLD_BINARY=/usr/bin/lld-$LLVM_VERSION \ + -DLLDB_BINARY=/usr/bin/lldb-$LLVM_VERSION \ + -DLLVMCONFIG_BINARY=/usr/bin/llvm-config-$LLVM_VERSION \ + -DOPT_BINARY=/usr/bin/opt-$LLVM_VERSION \ + -DSCANBUILD=/usr/bin/scan-build-$LLVM_VERSION \ + -DCLANG_TIDY_BINARY=/usr/bin/clang-tidy-$LLVM_VERSION \ + -DSCANVIEW=/usr/bin/scan-view-$LLVM_VERSION \ + -DLLVMNM=/usr/bin/llvm-nm-$LLVM_VERSION \ + -DLLVMPROFDATA=/usr/bin/llvm-profdata-$LLVM_VERSION \ -DENABLE_COMPILER_RT=OFF \ -DENABLE_LIBCXX=ON \ - -DLLVM_CMAKE_PREFIX_PATH=/usr/lib/llvm-10/lib/cmake/ ../ + -DLLVM_CMAKE_PREFIX_PATH=/usr/lib/llvm-$LLVM_VERSION/lib/cmake/ ../ make check