From 1ee424af6295306c15b340deeacc77fa7806dc71 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 22 Jul 2015 15:46:42 -0700
Subject: [PATCH] Unit test always use resource based meta data
---
src/AutoPilotPlugins/PX4/PX4ParameterLoader.cc | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/AutoPilotPlugins/PX4/PX4ParameterLoader.cc b/src/AutoPilotPlugins/PX4/PX4ParameterLoader.cc
index ebab9e95d..27f4d333d 100644
--- a/src/AutoPilotPlugins/PX4/PX4ParameterLoader.cc
+++ b/src/AutoPilotPlugins/PX4/PX4ParameterLoader.cc
@@ -92,11 +92,16 @@ void PX4ParameterLoader::loadParameterFactMetaData(void)
Q_ASSERT(_mapParameterName2FactMetaData.count() == 0);
- // First look for meta data that comes from a firmware download. Fall back to resource if not there.
- QSettings settings;
- QDir parameterDir = QFileInfo(settings.fileName()).dir();
- QString parameterFilename = parameterDir.filePath("PX4ParameterFactMetaData.xml");
- if (!QFile(parameterFilename).exists()) {
+ QString parameterFilename;
+
+ // We want unit test builds to always use the resource based meta data to provide repeatable results
+ if (!qgcApp()->runningUnitTests()) {
+ // First look for meta data that comes from a firmware download. Fall back to resource if not there.
+ QSettings settings;
+ QDir parameterDir = QFileInfo(settings.fileName()).dir();
+ parameterFilename = parameterDir.filePath("PX4ParameterFactMetaData.xml");
+ }
+ if (parameterFilename.isEmpty() || !QFile(parameterFilename).exists()) {
parameterFilename = ":/AutoPilotPlugins/PX4/ParameterFactMetaData.xml";
}
--
2.22.0