testrunner.py/Windows: Add Clang to the path

It is required for shiboken's ApiExtractor tests.

Move subroutine detectClang into utils.py
for usage by testrunner.py/setup.py.

Task-number: PYSIDE-431
Change-Id: I9f1984ea9fc9857ad3e7fddf621884fdc96ef52f
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 1 insertions, 17 deletions

diff --git a/setup.py b/setup.py
index cfc6c9dea..2c0ca3d41 100644
--- a/setup.py
+++ b/setup.py
@@ -170,7 +170,7 @@ from setuptools.command.bdist_egg import bdist_egg as _bdist_egg
 from setuptools.command.develop import develop as _develop
 
 from qtinfo import QtInfo
-from utils import rmtree
+from utils import rmtree, detectClang
 from utils import makefile
 from utils import copyfile
 from utils import copydir
@@ -350,22 +350,6 @@ def prefix():
         name += 'd'
     return name
 
-def detectClang():
-    source = 'LLVM_INSTALL_DIR'
-    clangDir = os.environ.get(source, None)
-    if not clangDir:
-        source = 'CLANG_INSTALL_DIR'
-        clangDir = os.environ.get(source, None)
-        if not clangDir:
-            source = 'llvm-config'
-            try:
-                output = run_process_output([source, '--prefix'])
-                if output:
-                    clangDir = output[0]
-            except:
-                pass
-    return [clangDir, source]
-
 # Initialize, pull and checkout submodules
 def prepareSubModules():
     print("Initializing submodules for PySide2 version %s" % __version__)