diff options
| author | Sergio Martins <smartins@kde.org> | 2018-09-22 16:04:47 +0100 |
|---|---|---|
| committer | Sergio Martins <smartins@kde.org> | 2018-09-22 16:04:47 +0100 |
| commit | 4eef128c25e07943a785a14b167df3fcbce0fe50 (patch) | |
| tree | 85304a5655cb12d6c722f46943e98f75eb0036ac | |
| parent | ec85c0843745eaa9a9acc64265673c457242fea1 (diff) | |
docker: pass the prefix to the build script
Some distros support multiple versions of clang, each in their own
prefix.
| -rwxr-xr-x | tests/docker/build-clazy.sh | 3 | ||||
| -rwxr-xr-x | tests/docker/test_docker.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/docker/build-clazy.sh b/tests/docker/build-clazy.sh index 4cd59997..6a908ded 100755 --- a/tests/docker/build-clazy.sh +++ b/tests/docker/build-clazy.sh @@ -19,4 +19,7 @@ then exit 1; fi +export PATH=$CLAZY_PREFIX/bin:$PATH +export LD_LIBRARY_PATH=$CLAZY_PREFIX/lib:$CLAZY_PREFIX/lib64:$LD_LIBRARY_PATH + cd /root/clazy && git pull && git checkout $BRANCH && cmake -DCMAKE_INSTALL_PREFIX=$CLAZY_PREFIX -DCMAKE_BUILD_TYPE=RelWithDebInfo . && make $J_FLAG && make install && cd tests && ./run_tests.py diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index 00019a0d..d914ff3d 100755 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -10,7 +10,7 @@ BUILD_SCRIPT = '/usr/bin/build-clazy.sh' class DockerTest: def __init__(self, name): self.name = name - + self.prefix = '/opt/clazy' def read_json_config(): dockerTests = [] @@ -34,7 +34,7 @@ def read_json_config(): def run_test(dockerTest): - cmd = 'docker run -i -t %s sh %s %s %s' % (dockerTest.name, BUILD_SCRIPT, BRANCH, MAKEFLAGS) + cmd = 'docker run -i -t %s sh %s %s %s %s' % (dockerTest.name, BUILD_SCRIPT, BRANCH, MAKEFLAGS, dockerTest.prefix) print cmd return os.system(cmd) == 0 |