OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Regression tests : Add support for 'rsp' project file extension

Browse Source
This commit is contained in:
Magne Sjaastad
2017-04-20 21:21:19 +02:00
parent fdac0ea887
commit 9d5fcaf5a1
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/Application/RiaApplication.cpp
+16 -3
View File
@@ -143,7 +143,7 @@ namespace RegTestNames
const QString generatedFolderName = "RegTestGeneratedImages"; const QString generatedFolderName = "RegTestGeneratedImages";
const QString diffFolderName = "RegTestDiffImages"; const QString diffFolderName = "RegTestDiffImages";
const QString baseFolderName = "RegTestBaseImages"; const QString baseFolderName = "RegTestBaseImages";
const QString testProjectName = "RegressionTest.rip"; const QString testProjectName = "RegressionTest";
const QString testFolderFilter = "TestCase*"; const QString testFolderFilter = "TestCase*";
const QString imageCompareExeName = "compare"; const QString imageCompareExeName = "compare";
const QString reportFileName = "ResInsightRegressionTestReport.html"; const QString reportFileName = "ResInsightRegressionTestReport.html";
@@ -2336,9 +2336,22 @@ void RiaApplication::runRegressionTest(const QString& testRootPath)
for (int dirIdx = 0; dirIdx < folderList.size(); ++dirIdx) for (int dirIdx = 0; dirIdx < folderList.size(); ++dirIdx)
{ {
QDir testCaseFolder(folderList[dirIdx].filePath()); QDir testCaseFolder(folderList[dirIdx].filePath());
if (testCaseFolder.exists(regTestProjectName))
QString projectFileName;
if (testCaseFolder.exists(regTestProjectName + ".rip"))
{ {
loadProject(testCaseFolder.filePath(regTestProjectName)); projectFileName = regTestProjectName + ".rip";
}
if (testCaseFolder.exists(regTestProjectName + ".rsp"))
{
projectFileName = regTestProjectName + ".rsp";
}
if (!projectFileName.isEmpty())
{
loadProject(testCaseFolder.filePath(projectFileName));
// Wait until all command objects have completed // Wait until all command objects have completed
while (!m_commandQueueLock.tryLock()) while (!m_commandQueueLock.tryLock())