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

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

View File

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

View File

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

View File

@ -151,14 +151,16 @@ void RiaRegressionTestRunner::runRegressionTest()
}
QString htmlReportFileName = generateHtmlReport(folderList, baseFolderName, generatedFolderName, diffFolderName, testDir);
QDesktopServices::openUrl(htmlReportFileName);
if (regressionTestConfig.openReportInBrowser())
{
QDesktopServices::openUrl(htmlReportFileName);
}
RiaLogging::info("--------------------------------------------------");
RiaLogging::info(QTime::currentTime().toString() + ": Launching regression tests");
RiaLogging::info("--------------------------------------------------");
QTime timeStamp;
timeStamp.start();
logInfoTextWithTimeInSeconds(timeStamp, "Starting regression tests\n");