From c42c50cb0cbdfd722c62b710aee22e871ca68343 Mon Sep 17 00:00:00 2001
From: Sergio Martins <smartins@kde.org>
Date: Sat, 22 Sep 2018 23:12:51 +0100
Subject: tests: Don't run qcolor-from-literal when using the crash workaround

This check requires AST matches, which are disabled on debian+llvm7
---
 tests/docker/build-clazy.sh | 17 +++++++++++++++--
 tests/docker/conf.json      |  3 ++-
 tests/docker/test_docker.py |  7 +++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/tests/docker/build-clazy.sh b/tests/docker/build-clazy.sh
index 0ad1cb5e..ff14f31a 100755
--- a/tests/docker/build-clazy.sh
+++ b/tests/docker/build-clazy.sh
@@ -3,7 +3,8 @@
 BRANCH=$1
 J_FLAG=$2
 CLAZY_PREFIX=$3
-LLVM_ROOT=$3
+IGNORE_CHECKS=$4
+LLVM_ROOT = $5
 
 if [ -z "$1" ]
 then
@@ -20,7 +21,19 @@ then
     exit 1;
 fi
 
+if [ "$IGNORE_CHECKS" = "none" ]
+then
+    IGNORE_CHECKS = ""
+else
+    IGNORE_CHECKS = " --exclude ${IGNORE_CHECKS} "
+fi
+
+if [ "$5" = "none" ]
+then
+    unset LLVM_ROOT
+fi
+
 export PATH=$CLAZY_PREFIX/bin:$PATH
 export LD_LIBRARY_PATH=$CLAZY_PREFIX/lib:$CLAZY_PREFIX/lib64:$LD_LIBRARY_PATH
 
-cd /root/clazy && git fetch && git checkout origin/$BRANCH && cmake -DCMAKE_INSTALL_PREFIX=$CLAZY_PREFIX -DCMAKE_BUILD_TYPE=RelWithDebInfo . && make $J_FLAG && make install && cd tests && ./run_tests.py
+cd /root/clazy && git fetch && git checkout origin/$BRANCH && cmake -DCMAKE_INSTALL_PREFIX=$CLAZY_PREFIX -DCMAKE_BUILD_TYPE=RelWithDebInfo . && 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 f2b2bc29..3059bb11 100644
--- a/tests/docker/conf.json
+++ b/tests/docker/conf.json
@@ -29,7 +29,8 @@
             "name" : "debian-unstable-llvm7",
             "url" : "iamsergio/clazy-debian-unstable",
             "prefix" : "/usr/lib/llvm-7/",
-            "llvm_root" : "/usr/lib/llvm-7/"
+            "llvm_root" : "/usr/lib/llvm-7/",
+            "ignore_checks" : "qcolor-from-literal"
         }
     ]
 }
diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py
index bb005362..463ed3fa 100755
--- a/tests/docker/test_docker.py
+++ b/tests/docker/test_docker.py
@@ -12,7 +12,8 @@ class DockerTest:
         self.name = name
         self.url = url
         self.prefix = '/opt/clazy'
-        self.llvm_root = ''
+        self.ignore_checks = 'none'
+        self.llvm_root = 'none'
 
 def read_json_config():
     dockerTests = []
@@ -34,6 +35,8 @@ def read_json_config():
                     dockerTest.prefix = test['prefix']
                 if 'llvm_root' in test:
                     dockerTest.llvm_root = test['llvm_root']
+                if 'ignore_checks' in test:
+                    dockerTest.ignore_checks = test['ignore_checks']
 
                 dockerTests.append(dockerTest)
     return dockerTests
@@ -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.prefix, dockerTest.llvm_root)
+    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)
     print cmd
     return os.system(cmd) == 0
 
-- 
cgit v1.2.3