Fix the tests through docker

Updated the python script that runs the tests inside docker.
Now respects llvm_root.

Removed old docker containers that don't work (yet).

2 files changed, 10 insertions, 31 deletions

diff --git a/tests/docker/conf.json b/tests/docker/conf.json
index 344c744f..4f201f0f 100644
--- a/tests/docker/conf.json
+++ b/tests/docker/conf.json
@@ -3,38 +3,20 @@
         {
             "name" : "ubuntu-18.04",
             "url" : "iamsergio/clazy-ubuntu-18.04",
-            "prefix" : "/usr/",
+            "llvm_root" : "/usr/lib/llvm-6.0/",
             "comment" : "llvm-6;Qt-5.9.5"
         },
         {
-            "name" : "opensuse-tumbleweed",
-            "url" : "iamsergio/clazy-opensuse-tumbleweed",
-            "prefix" : "/usr/",
-            "comment" : "llvm-6;Qt-5.11.1"
-        },
-        {
-            "name" : "debian-unstable-llvm5",
-            "url" : "iamsergio/clazy-debian-unstable",
-            "prefix" : "/usr/lib/llvm-5.0/",
-            "llvm_root" : "/usr/lib/llvm-5.0/",
-            "ignore_checks" : "qcolor-from-literal",
-            "comment" : "llvm5;Qt-5.11.1"
-        },
-        {
-            "name" : "debian-unstable-llvm6",
-            "url" : "iamsergio/clazy-debian-unstable",
-            "prefix" : "/usr/lib/llvm-6.0/",
-            "llvm_root" : "/usr/lib/llvm-6.0/",
-            "ignore_checks" : "qcolor-from-literal",
-            "comment" : "llvm6;Qt-5.11.1"
+            "name" : "ubuntu-18.04",
+            "url" : "iamsergio/clazy-ubuntu-18.04",
+            "llvm_root" : "/usr/lib/llvm-7",
+            "comment" : "llvm-7;Qt-5.9.5"
         },
         {
-            "name" : "debian-unstable-llvm7",
-            "url" : "iamsergio/clazy-debian-unstable",
-            "prefix" : "/usr/lib/llvm-7/",
-            "llvm_root" : "/usr/lib/llvm-7/",
-            "ignore_checks" : "qcolor-from-literal",
-            "comment" : "llvm7;Qt-5.11.1"
+            "name" : "ubuntu-18.04",
+            "url" : "iamsergio/clazy-ubuntu-18.04",
+            "llvm_root" : "/usr/lib/llvm-8",
+            "comment" : "llvm-8;Qt-5.9.5"
         }
     ]
 }
diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py
index 463ed3fa..4ee3d626 100755
--- a/tests/docker/test_docker.py
+++ b/tests/docker/test_docker.py
@@ -11,7 +11,6 @@ class DockerTest:
     def __init__(self, name, url):
         self.name = name
         self.url = url
-        self.prefix = '/opt/clazy'
         self.ignore_checks = 'none'
         self.llvm_root = 'none'
 
@@ -31,8 +30,6 @@ def read_json_config():
         for test in tests:
             if 'name' in test and 'url' in test:
                 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']
                 if 'ignore_checks' in test:
@@ -44,7 +41,7 @@ def read_json_config():
 
 
 def run_test(dockerTest):
-    cmd = 'docker run -i -t %s sh %s %s %s %s %s %s' % (dockerTest.url, BUILD_SCRIPT, BRANCH, MAKEFLAGS, dockerTest.prefix, 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)
     print cmd
     return os.system(cmd) == 0