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

Fix build problem on Qt5 in relation to unit tests.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-12-11 15:20:39 +01:00
parent 5368574848
commit f3a2f0c5b2
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -1296,16 +1296,29 @@ int RiaApplication::launchUnitTests()
#ifdef USE_UNIT_TESTS #ifdef USE_UNIT_TESTS
cvf::Assert::setReportMode(cvf::Assert::CONSOLE); cvf::Assert::setReportMode(cvf::Assert::CONSOLE);
int argc = QCoreApplication::argc(); int argc = QCoreApplication::arguments().size();
testing::InitGoogleTest(&argc, QCoreApplication::argv()); QStringList arguments = QCoreApplication::arguments();
std::vector<std::string> argumentsStd;
for (QString qstring : arguments)
{
argumentsStd.push_back(qstring.toStdString());
}
std::vector<char*> argv;
for (std::string& string : argumentsStd)
{
argv.push_back(&string.front());
}
testing::InitGoogleTest(&argc, argv.data());
// Use this macro in main() to run all tests. It returns 0 if all // Use this macro in main() to run all tests. It returns 0 if all
// tests are successful, or 1 otherwise. // tests are successful, or 1 otherwise.
// //
// RUN_ALL_TESTS() should be invoked after the command line has been // RUN_ALL_TESTS() should be invoked after the command line has been
// parsed by InitGoogleTest(). // parsed by InitGoogleTest().
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
#else #else
return -1; return -1;
#endif #endif