From 3efd0a1075df84fecc957f0778735e31966f4028 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 18 Oct 2015 20:24:43 -0700 Subject: [PATCH] Turn off MainWindowTest on windows Too flaky with problems that are likely unit test only problems --- QGCApplication.pro | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/QGCApplication.pro b/QGCApplication.pro index a9647133b..3f2564f2e 100644 --- a/QGCApplication.pro +++ b/QGCApplication.pro @@ -457,7 +457,6 @@ HEADERS += \ src/qgcunittest/FileManagerTest.h \ src/qgcunittest/FlightGearTest.h \ src/qgcunittest/LinkManagerTest.h \ - src/qgcunittest/MainWindowTest.h \ src/qgcunittest/MavlinkLogTest.h \ src/qgcunittest/MessageBoxTest.h \ src/qgcunittest/MultiSignalSpy.h \ @@ -477,7 +476,6 @@ SOURCES += \ src/qgcunittest/FileManagerTest.cc \ src/qgcunittest/FlightGearTest.cc \ src/qgcunittest/LinkManagerTest.cc \ - src/qgcunittest/MainWindowTest.cc \ src/qgcunittest/MavlinkLogTest.cc \ src/qgcunittest/MessageBoxTest.cc \ src/qgcunittest/MultiSignalSpy.cc \ @@ -487,6 +485,19 @@ SOURCES += \ src/qgcunittest/UnitTest.cc \ src/VehicleSetup/SetupViewTest.cc \ +!WindowsDebugAndRelease { +# This specific unit test seems to create havoc on Windows. Likely due to +# creating/destroying a main window multiple times without destorying the +# QApplication. The Qml destruction sequence is quite odd in that it is +# all delayed until it gets back the event loop. Which likely has something +# to do with the issue. +HEADERS += \ + src/qgcunittest/MainWindowTest.h \ + +SOURCES += \ + src/qgcunittest/MainWindowTest.cc \ +} + } # DebugBuild|WindowsDebugAndRelease } # MobileBuild -- 2.22.0