diff options
| author | Sergio Martins <smartins@kde.org> | 2019-10-08 23:37:56 +0100 |
|---|---|---|
| committer | Sergio Martins <smartins@kde.org> | 2019-10-08 23:39:03 +0100 |
| commit | 95359d148d2176df2b9a92106c17779e80ef3cce (patch) | |
| tree | 1998dc39e423c7d94a81d2e92dbc962ea8f802e7 | |
| parent | e0cdaad92a6c4a8dca45fe22caa6a3ae00ae9453 (diff) | |
tests: Allow to pass cmake arguments to the docker containers
Fedora container now uses -DLINK_CLAZY_TO_LLVM=ON as it's required
there for building
| -rwxr-xr-x | tests/docker/build-clazy.sh | 3 | ||||
| -rw-r--r-- | tests/docker/conf.json | 3 | ||||
| -rwxr-xr-x | tests/docker/test_docker.py | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/tests/docker/build-clazy.sh b/tests/docker/build-clazy.sh index d92753c6..9d873f3e 100755 --- a/tests/docker/build-clazy.sh +++ b/tests/docker/build-clazy.sh @@ -4,6 +4,7 @@ BRANCH=$1 J_FLAG=$2 IGNORE_CHECKS=$3 LLVM_ROOT=$4 +EXTRA_CMAKE_ARGS=$5 if [ "$IGNORE_CHECKS" = "none" ] then @@ -15,4 +16,4 @@ fi 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=$LLVM_ROOT -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 $EXTRA_CMAKE_ARGS . && make $J_FLAG && make install && cd tests && ./run_tests.py $IGNORE_CHECKS diff --git a/tests/docker/conf.json b/tests/docker/conf.json index 42d0c047..a65f2559 100644 --- a/tests/docker/conf.json +++ b/tests/docker/conf.json @@ -46,7 +46,8 @@ "name" : "fedora-31", "url" : "iamsergio/clazy-fedora-31", "llvm_root" : "/usr", - "comment" : "llvm-9;Qt-5.12.5" + "comment" : "llvm-9;Qt-5.12.5", + "extra_cmake_args" : "-DLINK_CLAZY_TO_LLVM=ON" } ] } diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index 4ee3d626..9f6252fc 100755 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -13,6 +13,7 @@ class DockerTest: self.url = url self.ignore_checks = 'none' self.llvm_root = 'none' + self.extra_cmake_args = 'none' def read_json_config(): dockerTests = [] @@ -32,6 +33,8 @@ def read_json_config(): dockerTest = DockerTest(test['name'], test['url']) if 'llvm_root' in test: dockerTest.llvm_root = test['llvm_root'] + if 'extra_cmake_args' in test: + dockerTest.extra_cmake_args = test['extra_cmake_args'] if 'ignore_checks' in test: dockerTest.ignore_checks = test['ignore_checks'] @@ -41,7 +44,7 @@ def read_json_config(): def run_test(dockerTest): - cmd = 'docker run -i -t %s sh %s %s %s %s %s' % (dockerTest.url, BUILD_SCRIPT, BRANCH, MAKEFLAGS, dockerTest.ignore_checks, dockerTest.llvm_root) + cmd = 'docker run -i -t %s sh %s %s %s %s %s' % (dockerTest.url, BUILD_SCRIPT, BRANCH, MAKEFLAGS, dockerTest.ignore_checks, dockerTest.llvm_root dockerTest.extra_cmake_args) print cmd return os.system(cmd) == 0 |