Browse Source

Unit test always use resource based meta data

QGC4.4
Don Gagne 10 years ago
parent
commit
1ee424af62
  1. 15
      src/AutoPilotPlugins/PX4/PX4ParameterLoader.cc

15
src/AutoPilotPlugins/PX4/PX4ParameterLoader.cc

@ -92,11 +92,16 @@ void PX4ParameterLoader::loadParameterFactMetaData(void)
Q_ASSERT(_mapParameterName2FactMetaData.count() == 0); Q_ASSERT(_mapParameterName2FactMetaData.count() == 0);
// First look for meta data that comes from a firmware download. Fall back to resource if not there. QString parameterFilename;
QSettings settings;
QDir parameterDir = QFileInfo(settings.fileName()).dir(); // We want unit test builds to always use the resource based meta data to provide repeatable results
QString parameterFilename = parameterDir.filePath("PX4ParameterFactMetaData.xml"); if (!qgcApp()->runningUnitTests()) {
if (!QFile(parameterFilename).exists()) { // 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"; parameterFilename = ":/AutoPilotPlugins/PX4/ParameterFactMetaData.xml";
} }

Loading…
Cancel
Save