mirror of https://github.com/catchorg/Catch2.git
Moved WIndows leak detector code out of main()
This commit is contained in:
parent
8cd413572a
commit
b1835e1de9
|
@ -50,6 +50,29 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CATCH_IMPL
|
#ifdef CATCH_IMPL
|
||||||
|
|
||||||
|
// !TBD: Move the leak detector code into a separate header
|
||||||
|
#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
|
||||||
|
#include <crtdbg.h>
|
||||||
|
class LeakDetector {
|
||||||
|
public:
|
||||||
|
LeakDetector() {
|
||||||
|
int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
|
||||||
|
flag |= _CRTDBG_LEAK_CHECK_DF;
|
||||||
|
flag |= _CRTDBG_ALLOC_MEM_DF;
|
||||||
|
_CrtSetDbgFlag(flag);
|
||||||
|
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
|
||||||
|
_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
|
||||||
|
// Change this to leaking allocation's number to break there
|
||||||
|
_CrtSetBreakAlloc(-1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
#else
|
||||||
|
class LeakDetector {};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
LeakDetector leakDetector;
|
||||||
|
|
||||||
#include "internal/catch_impl.hpp"
|
#include "internal/catch_impl.hpp"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -10,22 +10,8 @@
|
||||||
|
|
||||||
#ifndef __OBJC__
|
#ifndef __OBJC__
|
||||||
|
|
||||||
#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
|
|
||||||
#include <crtdbg.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Standard C/C++ main entry point
|
// Standard C/C++ main entry point
|
||||||
int main (int argc, char * argv[]) {
|
int main (int argc, char * argv[]) {
|
||||||
#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
|
|
||||||
int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
|
|
||||||
flag |= _CRTDBG_LEAK_CHECK_DF;
|
|
||||||
flag |= _CRTDBG_ALLOC_MEM_DF;
|
|
||||||
_CrtSetDbgFlag(flag);
|
|
||||||
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
|
|
||||||
_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
|
|
||||||
// Change this to leaking allocation's number to break there
|
|
||||||
_CrtSetBreakAlloc(-1);
|
|
||||||
#endif
|
|
||||||
int result = Catch::Session().run( argc, argv );
|
int result = Catch::Session().run( argc, argv );
|
||||||
return ( result < 0xff ? result : 0xff );
|
return ( result < 0xff ? result : 0xff );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue