OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Magne Sjaastad
2018-09-27 20:40:05 +02:00
parent 4877e058ed
commit acf6a17c40
14 changed files with 84 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp
View File

@@ -101,16 +101,19 @@ void RiaRegressionTestRunner::runRegressionTest(const QString& testRootPath, con
{
m_runningRegressionTests = true;
RiaRegressionTest regressionTestConfig;
regressionTestConfig.readSettingsFromApplicationStore();
QString currentApplicationPath = QDir::currentPath();
if (!regressionTestConfig.folderContainingCompareTool().isEmpty())
{
// Windows Only : The image compare tool requires current working directory to be at the folder
// containing the image compare tool
QDir::setCurrent(regressionTestConfig.folderContainingCompareTool());
{
RiaRegressionTest regressionTestConfig;
regressionTestConfig.readSettingsFromApplicationStore();
if (!regressionTestConfig.folderContainingCompareTool().isEmpty())
{
// Windows Only : The image compare tool requires current working directory to be at the folder
// containing the image compare tool
QDir::setCurrent(regressionTestConfig.folderContainingCompareTool());
}
}
QString generatedFolderName = RegTestNames::generatedFolderName;
@@ -225,7 +228,7 @@ void RiaRegressionTestRunner::runRegressionTest(const QString& testRootPath, con
QFileInfoList commandFileEntries = testCaseFolder.entryInfoList(filterList);
if (!commandFileEntries.empty())
{
QString currentApplicationPath = QDir::current().absolutePath();
QString currentAbsolutePath = QDir::current().absolutePath();
// Set current path to the folder containing the command file, as this is required when using file references
// in the command file
@@ -247,7 +250,7 @@ void RiaRegressionTestRunner::runRegressionTest(const QString& testRootPath, con
}
}
QDir::setCurrent(currentApplicationPath);
QDir::setCurrent(currentAbsolutePath);
// Create diff based on generated folders
{