diff --git a/ApplicationCode/Application/Tools/RiaRegressionTestRunner.h b/ApplicationCode/Application/Tools/RiaRegressionTestRunner.h index 3eeee12403..a5ae413efc 100644 --- a/ApplicationCode/Application/Tools/RiaRegressionTestRunner.h +++ b/ApplicationCode/Application/Tools/RiaRegressionTestRunner.h @@ -39,6 +39,7 @@ public: bool isRunningRegressionTests() const; static void updateRegressionTest(const QString& testRootPath); + static void regressionTestConfigureProject(); private: RiaRegressionTestRunner(); @@ -56,7 +57,6 @@ private: const QDir& testDir); static void removeDirectoryWithContent(QDir& dirToDelete); - static void regressionTestConfigureProject(); static void resizeMaximizedPlotWindows(); static QSize regressionDefaultImageSize(); static QString diff2htmlHeaderText(const QString& testRootPath); diff --git a/ApplicationCode/CommandFileInterface/RicfOpenProject.cpp b/ApplicationCode/CommandFileInterface/RicfOpenProject.cpp index 166963a44b..2a0d3461fe 100644 --- a/ApplicationCode/CommandFileInterface/RicfOpenProject.cpp +++ b/ApplicationCode/CommandFileInterface/RicfOpenProject.cpp @@ -1,17 +1,17 @@ ///////////////////////////////////////////////////////////////////////////////// // // Copyright (C) 2017 Statoil ASA -// +// // ResInsight is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// +// // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY // WARRANTY; without even the implied warranty of MERCHANTABILITY or // FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at +// +// See the GNU General Public License at // for more details. // ///////////////////////////////////////////////////////////////////////////////// @@ -22,11 +22,12 @@ #include "RiaApplication.h" #include "RiaLogging.h" +#include "RiaRegressionTestRunner.h" CAF_PDM_SOURCE_INIT(RicfOpenProject, "openProject"); //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- RicfOpenProject::RicfOpenProject() { @@ -34,7 +35,7 @@ RicfOpenProject::RicfOpenProject() } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void RicfOpenProject::execute() { @@ -45,5 +46,10 @@ void RicfOpenProject::execute() return; } + if (RiaRegressionTestRunner::instance()->isRunningRegressionTests()) + { + RiaRegressionTestRunner::regressionTestConfigureProject(); + } + RicfCommandFileExecutor::instance()->setLastProjectPath(m_path); }