mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
System : Output messages to std cout when running regression tests from command line
This commit is contained in:
parent
a010fc03d7
commit
287ff64fc2
@ -22,6 +22,7 @@
|
||||
#include "RiaBaseDefs.h"
|
||||
#include "RiaEclipseFileNameTools.h"
|
||||
#include "RiaImportEclipseCaseTools.h"
|
||||
#include "RiaLogging.h"
|
||||
#include "RiaPreferences.h"
|
||||
#include "RiaProjectModifier.h"
|
||||
#include "RiaRegressionTestRunner.h"
|
||||
@ -146,6 +147,15 @@ bool RiaArgumentParser::parseArguments()
|
||||
{
|
||||
CVF_ASSERT(o.valueCount() == 1);
|
||||
QString regressionTestPath = cvfqt::Utils::toQString(o.value(0));
|
||||
|
||||
// Use a logger writing to stdout instead of message panel
|
||||
// This is useful when executing regression tests on a build server, and this is the reason for creating the logger when
|
||||
// parsing the command line options
|
||||
auto stdLogger = new RiaStdOutLogger;
|
||||
stdLogger->setLevel(RI_LL_DEBUG);
|
||||
|
||||
RiaLogging::setLoggerInstance(stdLogger);
|
||||
|
||||
RiaRegressionTestRunner::instance()->executeRegressionTests(regressionTestPath, QStringList());
|
||||
return false;
|
||||
}
|
||||
|
@ -18,6 +18,7 @@
|
||||
|
||||
#include "RiaLogging.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
#ifdef WIN32
|
||||
@ -38,7 +39,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
//==================================================================================================
|
||||
//
|
||||
//
|
||||
@ -257,3 +257,87 @@ void RiaLogging::debug(const QString& message)
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RiuMessageLoggerBase::RiuMessageLoggerBase()
|
||||
: m_logLevel(RI_LL_WARNING)
|
||||
{
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
int RiuMessageLoggerBase::level() const
|
||||
{
|
||||
return m_logLevel;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessageLoggerBase::setLevel(int logLevel)
|
||||
{
|
||||
m_logLevel = logLevel;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessageLoggerBase::error(const char* message)
|
||||
{
|
||||
writeMessageWithPrefixToLogger("ERROR: ", message);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessageLoggerBase::warning(const char* message)
|
||||
{
|
||||
writeMessageWithPrefixToLogger("warning: ", message);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessageLoggerBase::info(const char* message)
|
||||
{
|
||||
writeMessageWithPrefixToLogger("info: ", message);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessageLoggerBase::debug(const char* message)
|
||||
{
|
||||
writeMessageWithPrefixToLogger("debug: ", message);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessageLoggerBase::writeMessageWithPrefixToLogger(const char* prefix, const char* message)
|
||||
{
|
||||
std::ostringstream oss;
|
||||
|
||||
oss << prefix;
|
||||
|
||||
if (message)
|
||||
{
|
||||
oss << message << std::endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
oss << "<no message>" << std::endl;
|
||||
}
|
||||
|
||||
writeMessageToLogger(oss.str());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiaStdOutLogger::writeMessageToLogger(const std::string& str)
|
||||
{
|
||||
std::cout << str;
|
||||
}
|
||||
|
@ -18,6 +18,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
|
||||
class QString;
|
||||
|
||||
enum RILogLevel
|
||||
@ -72,3 +74,37 @@ private:
|
||||
static RiaLogger* sm_logger;
|
||||
};
|
||||
|
||||
//==================================================================================================
|
||||
//
|
||||
//==================================================================================================
|
||||
class RiuMessageLoggerBase : public RiaLogger
|
||||
{
|
||||
public:
|
||||
explicit RiuMessageLoggerBase();
|
||||
|
||||
int level() const override;
|
||||
void setLevel(int logLevel) override;
|
||||
|
||||
void error(const char* message) override;
|
||||
void warning(const char* message) override;
|
||||
void info(const char* message) override;
|
||||
void debug(const char* message) override;
|
||||
|
||||
protected:
|
||||
virtual void writeMessageToLogger(const std::string& str) = 0;
|
||||
|
||||
private:
|
||||
void writeMessageWithPrefixToLogger(const char* prefix, const char* message);
|
||||
|
||||
private:
|
||||
int m_logLevel;
|
||||
};
|
||||
|
||||
//==================================================================================================
|
||||
//
|
||||
//==================================================================================================
|
||||
class RiaStdOutLogger : public RiuMessageLoggerBase
|
||||
{
|
||||
public:
|
||||
void writeMessageToLogger(const std::string& str) override;
|
||||
};
|
||||
|
@ -153,9 +153,14 @@ void RiaRegressionTestRunner::runRegressionTest()
|
||||
QString htmlReportFileName = generateHtmlReport(folderList, baseFolderName, generatedFolderName, diffFolderName, testDir);
|
||||
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");
|
||||
|
||||
for (const QFileInfo& folderFileInfo : folderList)
|
||||
|
Loading…
Reference in New Issue
Block a user