From 26f243eefd96f4932fa342c2e00617ce21a2bdc4 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 18 Oct 2017 14:38:52 -0700 Subject: [PATCH] Remove QGCAudioWorkerTest temporarily Need to hand carry some stuff from Stable to master in order to fix --- qgroundcontrol.pro | 2 -- src/qgcunittest/UnitTestList.cc | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 324b1a7a7..e8f5e04bd 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -413,7 +413,6 @@ DebugBuild { PX4FirmwarePlugin { PX4FirmwarePluginFactory { APMFirmwarePlugin { HEADERS += \ src/AnalyzeView/LogDownloadTest.h \ - src/audio/QGCAudioWorkerTest.h \ src/FactSystem/FactSystemTestBase.h \ src/FactSystem/FactSystemTestGeneric.h \ src/FactSystem/FactSystemTestPX4.h \ @@ -449,7 +448,6 @@ DebugBuild { PX4FirmwarePlugin { PX4FirmwarePluginFactory { APMFirmwarePlugin { SOURCES += \ src/AnalyzeView/LogDownloadTest.cc \ - src/audio/QGCAudioWorkerTest.cc \ src/FactSystem/FactSystemTestBase.cc \ src/FactSystem/FactSystemTestGeneric.cc \ src/FactSystem/FactSystemTestPX4.cc \ diff --git a/src/qgcunittest/UnitTestList.cc b/src/qgcunittest/UnitTestList.cc index becadb020..2a4bee03d 100644 --- a/src/qgcunittest/UnitTestList.cc +++ b/src/qgcunittest/UnitTestList.cc @@ -38,7 +38,11 @@ #include "PlanMasterControllerTest.h" #include "MissionSettingsTest.h" #include "QGCMapPolygonTest.h" + +#if 0 +// Temporarily disabled until I move some stuff from Stable to master #include "QGCAudioWorkerTest.h" +#endif UT_REGISTER_TEST(FactSystemTestGeneric) UT_REGISTER_TEST(FactSystemTestPX4) @@ -64,7 +68,10 @@ UT_REGISTER_TEST(SpeedSectionTest) UT_REGISTER_TEST(PlanMasterControllerTest) UT_REGISTER_TEST(MissionSettingsTest) UT_REGISTER_TEST(QGCMapPolygonTest) +#if 0 +// Temporarily disabled until I move some stuff from Stable to master UT_REGISTER_TEST(QGCAudioWorkerTest) +#endif // List of unit test which are currently disabled. // If disabling a new test, include reason in comment. -- 2.22.0