diff options
| author | Sergio Martins <smartins@kde.org> | 2018-09-22 17:35:19 +0100 |
|---|---|---|
| committer | Sergio Martins <smartins@kde.org> | 2018-09-22 17:35:19 +0100 |
| commit | b4818d3140b7eb2b3a80005634ab1fa004880a10 (patch) | |
| tree | 1f209380f8e1575134e53f6fd63428c777193f87 | |
| parent | fe214d75be23b5d1edf1aaab2da6d9f240c7a472 (diff) | |
test_docker.py: Allow to test two clang version on the same container
debian container for example can have many clang versions, so in our
conf.json "name" is now the ID. Different names can use the same
docker url now.
| -rw-r--r-- | tests/docker/conf.json | 17 | ||||
| -rwxr-xr-x | tests/docker/test_docker.py | 9 |
2 files changed, 18 insertions, 8 deletions
diff --git a/tests/docker/conf.json b/tests/docker/conf.json index 2cfb0034..cbda9b7b 100644 --- a/tests/docker/conf.json +++ b/tests/docker/conf.json @@ -1,20 +1,29 @@ { "tests" : [ { - "name" : "iamsergio/clazy-ubuntu-17.04", + "name" : "ubuntu-17.04", + "url" : "iamsergio/clazy-ubuntu-17.04", "prefix" : "/usr/" }, { - "name" : "iamsergio/clazy-ubuntu-16.04", + "name" : "ubuntu-16.04", + "url" : "iamsergio/clazy-ubuntu-16.04", "prefix" : "/usr/" }, { - "name" : "iamsergio/clazy-opensuse-tumbleweed", + "name" : "opensuse-tumbleweed", + "url" : "iamsergio/clazy-opensuse-tumbleweed", "prefix" : "/usr/" }, { - "name" : "iamsergio/clazy-archlinux", + "name" : "archlinux", + "url" : "iamsergio/clazy-archlinux", "prefix" : "/usr/" + }, + { + "name" : "debian-unstable", + "url" : "iamsergio/clazy-debian-unstable", + "prefix" : "/usr/lib/llvm-6.0/" } ] } diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index e4ab17ec..ef0a9de1 100755 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -8,8 +8,9 @@ BRANCH = 'master' BUILD_SCRIPT = '/root/clazy/tests/docker/build-clazy.sh' class DockerTest: - def __init__(self, name): + def __init__(self, name, url): self.name = name + self.url = url self.prefix = '/opt/clazy' def read_json_config(): @@ -26,8 +27,8 @@ def read_json_config(): if 'tests' in decoded: tests = decoded['tests'] for test in tests: - if 'name' in test: - dockerTest = DockerTest(test['name']) + if 'name' in test and 'url' in test: + dockerTest = DockerTest(test['name'], test['url']) if 'prefix' in test: dockerTest.prefix = test['prefix'] dockerTests.append(dockerTest) @@ -36,7 +37,7 @@ def read_json_config(): def run_test(dockerTest): - cmd = 'docker run -i -t %s sh %s %s %s %s' % (dockerTest.name, BUILD_SCRIPT, BRANCH, MAKEFLAGS, dockerTest.prefix) + cmd = 'docker run -i -t %s sh %s %s %s %s' % (dockerTest.url, BUILD_SCRIPT, BRANCH, MAKEFLAGS, dockerTest.prefix) print cmd return os.system(cmd) == 0 |