diff options
| author | Sergio Martins <smartins@kde.org> | 2018-09-22 17:42:34 +0100 |
|---|---|---|
| committer | Sergio Martins <smartins@kde.org> | 2018-09-22 17:44:54 +0100 |
| commit | 8ba46693c46ebedaf58257a7b01ce5f4f1e4a247 (patch) | |
| tree | 6cc4d5a8c923b9c8a27324f694e18768c485fe82 | |
| parent | b4818d3140b7eb2b3a80005634ab1fa004880a10 (diff) | |
test_docker.py: Add llvm_root property to json
On debian llvm-config is called llvm-config-X and there's symlinks
pointing to the correct X. By setting LLVM_ROOT env variable
FindLLVM.cmake will find the correct one
| -rwxr-xr-x | tests/docker/build-clazy.sh | 1 | ||||
| -rwxr-xr-x | tests/docker/test_docker.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/docker/build-clazy.sh b/tests/docker/build-clazy.sh index 6a908ded..c897c3ab 100755 --- a/tests/docker/build-clazy.sh +++ b/tests/docker/build-clazy.sh @@ -3,6 +3,7 @@ BRANCH=$1 J_FLAG=$2 CLAZY_PREFIX=$3 +LLVM_ROOT=$3 if [ -z "$1" ] then diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index ef0a9de1..93609dba 100755 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -12,6 +12,7 @@ class DockerTest: self.name = name self.url = url self.prefix = '/opt/clazy' + self.llvm_root = '' def read_json_config(): dockerTests = [] @@ -31,13 +32,16 @@ def read_json_config(): dockerTest = DockerTest(test['name'], test['url']) if 'prefix' in test: dockerTest.prefix = test['prefix'] + if 'llvm_root' in test: + dockerTest.llvm_root = test['llvm_root'] + dockerTests.append(dockerTest) return dockerTests def run_test(dockerTest): - cmd = 'docker run -i -t %s sh %s %s %s %s' % (dockerTest.url, BUILD_SCRIPT, BRANCH, MAKEFLAGS, dockerTest.prefix) + cmd = 'docker run -i -t %s sh %s %s %s %s %s' % (dockerTest.url, BUILD_SCRIPT, BRANCH, MAKEFLAGS, dockerTest.prefix dockerTest.llvm_root) print cmd return os.system(cmd) == 0 |