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

#4165 Regression Test : When running on build server, do not open report in browser locally

Browse Source
This commit is contained in:
Magne Sjaastad 2019-03-04 11:35:25 +01:00
parent 3d145464c1
commit 728eb79a3d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/Tools/RiaRegressionTest.cpp
View File

@ -60,6 +60,8 @@ RiaRegressionTest::RiaRegressionTest(void)
CAF_PDM_InitField( CAF_PDM_InitField(
&useOpenMPForGeometryCreation, "useOpenMPForGeometryCreation", true, "Use OpenMP For Geometry Creation", "", "", ""); &useOpenMPForGeometryCreation, "useOpenMPForGeometryCreation", true, "Use OpenMP For Geometry Creation", "", "", "");
CAF_PDM_InitField(&openReportInBrowser, "openReportInBrowser", false, "Open Generated Report in Browser", "", "", "");
CAF_PDM_InitFieldNoDefault( CAF_PDM_InitFieldNoDefault(
&testFilter, &testFilter,
"testFilter", "testFilter",

1
ApplicationCode/Application/Tools/RiaRegressionTest.h
View File

@ -41,6 +41,7 @@ public:
caf::PdmField<QString> testFilter; caf::PdmField<QString> testFilter;
caf::PdmField<bool> showInteractiveDiffImages; caf::PdmField<bool> showInteractiveDiffImages;
caf::PdmField<bool> useOpenMPForGeometryCreation; caf::PdmField<bool> useOpenMPForGeometryCreation;
caf::PdmField<bool> openReportInBrowser;
protected: protected:
void defineEditorAttribute(const caf::PdmFieldHandle* field, void defineEditorAttribute(const caf::PdmFieldHandle* field,

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

@ -151,9 +151,11 @@ void RiaRegressionTestRunner::runRegressionTest()
} }
QString htmlReportFileName = generateHtmlReport(folderList, baseFolderName, generatedFolderName, diffFolderName, testDir); QString htmlReportFileName = generateHtmlReport(folderList, baseFolderName, generatedFolderName, diffFolderName, testDir);
QDesktopServices::openUrl(htmlReportFileName);
if (regressionTestConfig.openReportInBrowser())
{
QDesktopServices::openUrl(htmlReportFileName);
}
RiaLogging::info("--------------------------------------------------"); RiaLogging::info("--------------------------------------------------");
RiaLogging::info(QTime::currentTime().toString() + ": Launching regression tests"); RiaLogging::info(QTime::currentTime().toString() + ": Launching regression tests");