desura
/
Desurium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated gtest run and exit to work properly in release (problem with static init of gtest not using command line args)

master
Lodle 2013-10-23 09:36:21 -07:00
parent 994b0a405d
commit 127f927c99
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/shared/uicore/code/gcUnitTestPage.cpp
View File

@ -26,8 +26,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
using namespace testing;
#ifdef DEBUG
CVar g_bAssertOnFailure("unittest_assertonfailure", "true");
CVar g_bRunOnStartup("unittest_runonstartup", "true");
#else
CVar g_bAssertOnFailure("unittest_assertonfailure", "false");
CVar g_bRunOnStartup("unittest_runonstartup", "false");
#endif
CVar g_strUnitTestFilter("unittest_filter", "*");
class gcUnitTestWatcher : public EmptyTestEventListener
@ -102,9 +108,19 @@ static gcUnitTestWatcher* SetupTestWatcher()
TestEventListeners& listeners = UnitTest::GetInstance()->listeners();
listeners.Append(pWatcher);
#ifdef WIN32
UTIL::MISC::CMDArgs args(GetCommandLineA());
#else
char* szCmdLine = NULL;
UTIL::FS::readWholeFile("/proc/self/cmdline", &szCmdLine);
int argc = 0;
InitGoogleTest(&argc, (char**)NULL);
UTIL::MISC::CMDArgs args(szCmdLine);
safe_delete(szCmdLine);
#endif
int argc = args.getArgc();
InitGoogleTest(&argc, const_cast<char**>(args.getArgv()));
return pWatcher;
}