From 1bdbe06c82051abbe7028c5f2babe586c94eb302 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 3 Jul 2017 15:16:38 +0200 Subject: MSVC: Run tests with MSVC2017 instead of MSVC2013 It appears tests compiled with MSVC2013/64bit are prone to crashes. Keep only a developer build/compile test in default.txt and move the packacking builds to qt5.txt with tests disabled. Enable testing with MSVC2017 builds in qt5.txt. Task-number: QTBUG-58654 Task-number: QTBUG-50835 Change-Id: I6061fe3a585c4bb94100d73d04434aca42c82608 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 4 +--- coin/platform_configs/qt5.txt | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index d2328871..c82a0feb 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,9 +1,7 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release +qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release DisableTests qtci-windows-10-x86_64-7 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples -qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-7 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index efcdd620..fec2a44c 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,8 +1,10 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -- cgit v1.2.3