TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for windows

Browse source 
Windows segfault was only appearing after changes to windowManagerTest, either that or because linux was failing first it wasn't giving windows a chance to fail. see if this works.
This commit is contained in:
marauder2k7 2023-07-25 13:29:22 +01:00
parent 0ba22b7969
commit 564d48e95f
4 changed files with 58 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Engine/source/testing/unitTesting.cpp
View file

@ -26,8 +26,11 @@
#include "console/codeBlock.h"
#include "console/engineAPI.h"
#include "console/consoleInternal.h"
#include "memoryTester.h"
#if defined(TORQUE_OS_WIN)
#define _CRTDBG_MAP_ALLOC
#include <crtdbg.h>
#endif
//-----------------------------------------------------------------------------
class TorqueUnitTestListener : public ::testing::EmptyTestEventListener
@ -90,6 +93,40 @@ public:
TorqueUnitTestListener(bool verbose) : mVerbose(verbose) {}
};
class MemoryLeakDetector : public ::testing::EmptyTestEventListener
{
public:
virtual void OnTestStart(const ::testing::TestInfo& testInfo)
{
#if defined(TORQUE_OS_WIN)
_CrtMemCheckpoint(&memState_);
#endif
}
virtual void OnTestEnd(const ::testing::TestInfo& testInfo)
{
if (testInfo.result()->Passed())
{
#if defined(TORQUE_OS_WIN)
_CrtMemState stateNow, stateDiff;
_CrtMemCheckpoint(&stateNow);
int diffResult = _CrtMemDifference(&stateDiff, &memState_, &stateNow);
if (diffResult)
{
FAIL() << "Memory leak of " << stateDiff.lSizes[1] << " byte(s) detected.";
}
#endif
}
}
private:
#if defined(TORQUE_OS_WIN)
_CrtMemState memState_;
#endif
public:
MemoryLeakDetector() {}
};
class TorqueScriptFixture : public testing::Test {};
class TorqueScriptTest : public TorqueScriptFixture {
@ -105,7 +142,7 @@ private:
};
// uncomment to debug tests and use the test explorer.
//#define TEST_EXPLORER
#define TEST_EXPLORER
#if !defined(TEST_EXPLORER)
int main(int argc, char** argv)
{
@ -123,6 +160,17 @@ int main(int argc, char** argv)
Con::evaluate("GFXInit::createNullDevice();");
Con::evaluate("if (!isObject(GuiDefaultProfile)) new GuiControlProfile(GuiDefaultProfile){}; if (!isObject(GuiTooltipProfile)) new GuiControlProfile(GuiTooltipProfile){};");
testing::InitGoogleTest(&argc, argv);
// Fetch the unit test instance.
testing::UnitTest& unitTest = *testing::UnitTest::GetInstance();
// Fetch the unit test event listeners.
testing::TestEventListeners& listeners = unitTest.listeners();
listeners.Append(new MemoryLeakDetector());
// Add the Torque unit test listener.
listeners.Append(new TorqueUnitTestListener(true));
int res = RUN_ALL_TESTS();
StandardMainLoop::shutdown();
@ -220,11 +268,6 @@ DefineEngineFunction(runAllUnitTests, int, (const char* testSpecs, const char* r
// Release the default listener.
delete listeners.Release(listeners.default_result_printer());
if (Con::getBoolVariable("$Testing::CheckMemoryLeaks", false)) {
// Add the memory leak tester.
listeners.Append(new testing::MemoryLeakDetector);
}
// Add the Torque unit test listener.
listeners.Append(new TorqueUnitTestListener(true));