feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: MSVC2015 and Build Tools are supported...

Browse Source 
...so, expect them if they are present.

Change-Id: I333bba81717d44431857a543540e5599e2de7fed
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
This commit is contained in:
Christian Stenger
2016-04-06 09:00:19 +02:00
parent 9cc50a96e4
commit 532cd88dd7
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/system/suite_general/tst_default_settings/test.py
View File

@@ -189,6 +189,10 @@ def __getWinCompilers__():
if os.path.exists(compiler):
parameters = testData.field(record, "displayedParameters").split(",")
usedParameters = testData.field(record, "usedParameters").split(",")
idePath = testData.field(record, "IDEPath")
if len(idePath):
if not os.path.exists(os.path.abspath(os.path.join(envvar, idePath))):
continue
if testData.field(record, "isSDK") == "true":
for para, used in zip(parameters, usedParameters):
result.append(

50
tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv vendored
View File

@@ -1,23 +1,27 @@
"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"
"VS80COMNTOOLS" "..\..\VC\Bin" "vcvars64.bat" "Microsoft Visual C++ Compiler 8.0" "ia64" "ia64" "false"
"VS80COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_ia64.bat" "Microsoft Visual C++ Compiler 8.0" "x86_ia64" "x86_ia64" "false"
"VS90COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 9.0" "x86" "" "false"
"VS90COMNTOOLS" "..\..\VC\Bin\amd64" "vcvarsamd64.bat" "Microsoft Visual C++ Compiler 9.0" "amd64" "amd64" "false"
"VS90COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_amd64.bat" "Microsoft Visual C++ Compiler 9.0" "x86_amd64" "x86_amd64" "false"
"VS90COMNTOOLS" "..\..\VC\Bin" "vcvars64.bat" "Microsoft Visual C++ Compiler 9.0" "ia64" "ia64" "false"
"VS90COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_ia64.bat" "Microsoft Visual C++ Compiler 9.0" "x86_ia64" "x86_ia64" "false"
"VS100COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 10.0" "x86" "" "false"
"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"
"envvar" "path" "file" "displayName" "displayedParameters" "usedParameters" "isSDK" "IDEPath"
"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" ""
"VS80COMNTOOLS" "..\..\VC\Bin" "vcvars64.bat" "Microsoft Visual C++ Compiler 8.0" "ia64" "ia64" "false" ""
"VS80COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_ia64.bat" "Microsoft Visual C++ Compiler 8.0" "x86_ia64" "x86_ia64" "false" ""
"VS90COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 9.0" "x86" "" "false" ""
"VS90COMNTOOLS" "..\..\VC\Bin\amd64" "vcvarsamd64.bat" "Microsoft Visual C++ Compiler 9.0" "amd64" "amd64" "false" ""
"VS90COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_amd64.bat" "Microsoft Visual C++ Compiler 9.0" "x86_amd64" "x86_amd64" "false" ""
"VS90COMNTOOLS" "..\..\VC\Bin" "vcvars64.bat" "Microsoft Visual C++ Compiler 9.0" "ia64" "ia64" "false" ""
"VS90COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_ia64.bat" "Microsoft Visual C++ Compiler 9.0" "x86_ia64" "x86_ia64" "false" ""
"VS100COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 10.0" "x86" "" "false" ""
"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" ""
"VS140COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 14.0" "x86" "" "false" "..\IDE\devenv.exe"
"VS140COMNTOOLS" "..\..\VC" "vcvarsall.bat" "Microsoft Visual C++ Compiler 14.0" "x86,amd64,x86_amd64,x86_arm,amd64_arm" "x86,amd64,x86_amd64,x86_arm,amd64_arm" "false" "..\IDE\devenv.exe"
"ProgramFiles" "Microsoft Visual C++ Build Tools" "vcbuildtools.bat" "Microsoft Visual C++ Build Tools" "x86,x64,x86_arm,x64_arm" "x86,amd64,x86_arm,amd64_arm" "false" ""
"ProgramFiles(x86)" "Microsoft Visual C++ Build Tools" "vcbuildtools.bat" "Microsoft Visual C++ Build Tools" "x86,x64,x86_arm,x64_arm" "x86,amd64,x86_arm,amd64_arm" "false" ""
1 envvar path file displayName displayedParameters usedParameters isSDK IDEPath
2 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
3 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
4 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
5 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
6 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
7 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
8 VS80COMNTOOLS ..\..\VC\Bin vcvars32.bat Microsoft Visual C++ Compiler 8.0 x86 false
9 VS80COMNTOOLS ..\..\VC\Bin\amd64 vcvarsamd64.bat Microsoft Visual C++ Compiler 8.0 amd64 amd64 false
10 VS80COMNTOOLS ..\..\VC\Bin vcvarsx86_amd64.bat Microsoft Visual C++ Compiler 8.0 x86_amd64 x86_amd64 false
11 VS80COMNTOOLS ..\..\VC\Bin vcvars64.bat Microsoft Visual C++ Compiler 8.0 ia64 ia64 false
12 VS80COMNTOOLS ..\..\VC\Bin vcvarsx86_ia64.bat Microsoft Visual C++ Compiler 8.0 x86_ia64 x86_ia64 false
13 VS90COMNTOOLS ..\..\VC\Bin vcvars32.bat Microsoft Visual C++ Compiler 9.0 x86 false
14 VS90COMNTOOLS ..\..\VC\Bin\amd64 vcvarsamd64.bat Microsoft Visual C++ Compiler 9.0 amd64 amd64 false
15 VS90COMNTOOLS ..\..\VC\Bin vcvarsx86_amd64.bat Microsoft Visual C++ Compiler 9.0 x86_amd64 x86_amd64 false
16 VS90COMNTOOLS ..\..\VC\Bin vcvars64.bat Microsoft Visual C++ Compiler 9.0 ia64 ia64 false
17 VS90COMNTOOLS ..\..\VC\Bin vcvarsx86_ia64.bat Microsoft Visual C++ Compiler 9.0 x86_ia64 x86_ia64 false
18 VS100COMNTOOLS ..\..\VC\Bin vcvars32.bat Microsoft Visual C++ Compiler 10.0 x86 false
19 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
20 VS110COMNTOOLS ..\..\VC\Bin vcvars32.bat Microsoft Visual C++ Compiler 11.0 x86 false
21 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
22 VS120COMNTOOLS ..\..\VC\Bin vcvars32.bat Microsoft Visual C++ Compiler 12.0 x86 false
23 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
24 VS140COMNTOOLS ..\..\VC\Bin vcvars32.bat Microsoft Visual C++ Compiler 14.0 x86 false ..\IDE\devenv.exe
25 VS140COMNTOOLS ..\..\VC vcvarsall.bat Microsoft Visual C++ Compiler 14.0 x86,amd64,x86_amd64,x86_arm,amd64_arm x86,amd64,x86_amd64,x86_arm,amd64_arm false ..\IDE\devenv.exe
26 ProgramFiles Microsoft Visual C++ Build Tools vcbuildtools.bat Microsoft Visual C++ Build Tools x86,x64,x86_arm,x64_arm x86,amd64,x86_arm,amd64_arm false
27 ProgramFiles(x86) Microsoft Visual C++ Build Tools vcbuildtools.bat Microsoft Visual C++ Build Tools x86,x64,x86_arm,x64_arm x86,amd64,x86_arm,amd64_arm false