Squish: Fix tst_default_settings

Change-Id: I136d93e7b698dcda5388bc24b9bcaaae482fb861
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

2 files changed, 12 insertions, 19 deletions

diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py
index 965152901d..2e5d5d9f82 100644
--- a/tests/system/suite_general/tst_default_settings/test.py
+++ b/tests/system/suite_general/tst_default_settings/test.py
@@ -186,9 +186,10 @@ def __getExpectedCompilers__():
 
 def __getWinCompilers__():
     result = []
-    winEnvVars = __getWinEnvVars__()
     for record in testData.dataset("win_compiler_paths.tsv"):
-        envvar = winEnvVars.get(testData.field(record, "envvar"), "")
+        envvar = os.getenv(testData.field(record, "envvar"))
+        if not envvar:
+            continue
         compiler = os.path.abspath(os.path.join(envvar, testData.field(record, "path"),
                                                 testData.field(record, "file")))
         if os.path.exists(compiler):
@@ -206,27 +207,14 @@ def __getWinCompilers__():
                                    :"%s %s" % (compiler, used)})
     return result
 
-# using os.getenv() or getOutputFromCmdline() do not work - they would return C:\Program Files (x86)
-# for %ProgramFiles% as well as for %ProgramFiles(x86)% when using Python 32bit on 64bit machines
-def __getWinEnvVars__():
-    result = {}
-    tmpF, tmpFPath = tempfile.mkstemp()
-    envvars = subprocess.call('set', stdout=tmpF, shell=True)
-    os.close(tmpF)
-    tmpF = open(tmpFPath, "r")
-    for line in tmpF:
-        tmp = line.split("=")
-        result[tmp[0]] = tmp[1]
-    tmpF.close()
-    os.remove(tmpFPath)
-    return result
-
 def __getExpectedDebuggers__():
+    exeSuffix = ""
     result = []
     if platform.system() in ('Microsoft', 'Windows'):
         result.extend(__getCDB__())
+        exeSuffix = ".exe"
     for debugger in ["gdb", "lldb"]:
-        result.extend(findAllFilesInPATH(debugger))
+        result.extend(findAllFilesInPATH(debugger + exeSuffix))
     if platform.system() == 'Linux':
         result.extend(filter(lambda s: not ("lldb-platform" in s or "lldb-gdbserver" in s),
                              findAllFilesInPATH("lldb-*")))
@@ -255,6 +243,7 @@ def __getCDB__():
     return result
 
 def __compareCompilers__(foundCompilers, expectedCompilers):
+    # TODO: Check if all expected compilers were found
     equal = True
     flags = 0
     isWin = platform.system() in ('Microsoft', 'Windows')
@@ -276,7 +265,7 @@ def __compareCompilers__(foundCompilers, expectedCompilers):
                         or currentFound.values() == currentExp.values()):
                         foundExp = True
                         break
-                equal = foundExp
+            equal = foundExp
         else:
             if isWin:
                 equal = currentFound.lower() in __lowerStrs__(expectedCompilers)
diff --git a/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv b/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv
index 0438a4698b..a9a8e548e3 100644
--- a/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv
+++ b/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv
@@ -1,8 +1,10 @@
 "envvar"	"path"	"file"	"displayName"	"displayedParameters"	"usedParameters"	"isSDK"
 "ProgramFiles"	"Microsoft SDKs\Windows\v7.0\Bin"	"SetEnv.cmd"	"Microsoft Windows SDK for Windows 7"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"/x86,/x64,/x64,/ia64,/ia64"	"true"
 "ProgramFiles(x86)"	"Microsoft SDKs\Windows\v7.0\Bin"	"SetEnv.cmd"	"Microsoft Windows SDK for Windows 7"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"/x86,/x64,/x64,/ia64,/ia64"	"true"
+"ProgramW6432"	"Microsoft SDKs\Windows\v7.0\Bin"	"SetEnv.cmd"	"Microsoft Windows SDK for Windows 7"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"/x86,/x64,/x64,/ia64,/ia64"	"true"
 "ProgramFiles"	"Microsoft SDKs\Windows\v7.1\Bin"	"SetEnv.cmd"	"Microsoft Windows SDK for Windows 7"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"/x86,/x64,/x64,/ia64,/ia64"	"true"
 "ProgramFiles(x86)"	"Microsoft SDKs\Windows\v7.1\Bin"	"SetEnv.cmd"	"Microsoft Windows SDK for Windows 7"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"/x86,/x64,/x64,/ia64,/ia64"	"true"
+"ProgramW6432"	"Microsoft SDKs\Windows\v7.1\Bin"	"SetEnv.cmd"	"Microsoft Windows SDK for Windows 7"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"/x86,/x64,/x64,/ia64,/ia64"	"true"
 "VS80COMNTOOLS"	"..\..\VC\Bin"	"vcvars32.bat"	"Microsoft Visual C++ Compiler 8.0"	"x86"	""	"false"
 "VS80COMNTOOLS"	"..\..\VC\Bin\amd64"	"vcvarsamd64.bat"	"Microsoft Visual C++ Compiler 8.0"	"amd64"	"amd64"	"false"
 "VS80COMNTOOLS"	"..\..\VC\Bin"	"vcvarsx86_amd64.bat"	"Microsoft Visual C++ Compiler 8.0"	"x86_amd64"	"x86_amd64"	"false"
@@ -17,3 +19,5 @@
 "VS100COMNTOOLS"	"..\..\VC"	"vcvarsall.bat"	"Microsoft Visual C++ Compiler 10.0"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"false"
 "VS110COMNTOOLS"	"..\..\VC\Bin"	"vcvars32.bat"	"Microsoft Visual C++ Compiler 11.0"	"x86"	""	"false"
 "VS110COMNTOOLS"	"..\..\VC"	"vcvarsall.bat"	"Microsoft Visual C++ Compiler 11.0"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"false"
+"VS120COMNTOOLS"	"..\..\VC\Bin"	"vcvars32.bat"	"Microsoft Visual C++ Compiler 12.0"	"x86"	""	"false"
+"VS120COMNTOOLS"	"..\..\VC"	"vcvarsall.bat"	"Microsoft Visual C++ Compiler 12.0"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"x86,amd64,x86_amd64,ia64,x86_ia64"	"false"