Skip to content

Commit fce2253

Browse files
committed
msvc: avoid debug assertion windows in Debug Mode
For regular debugging, it is pretty helpful when a debug assertion in a running application triggers a window that offers to start the debugger. However, when running the test suite, it is not so helpful, in particular when the debug assertions are then suppressed anyway because we disable the invalid parameter checking (via invalidcontinue.obj, see the comment in config.mak.uname about that object for more information). So let's simply disable that window in Debug Mode (it is already disabled in Release Mode). Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 89eafaf commit fce2253

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

compat/mingw.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3049,6 +3049,10 @@ static void maybe_redirect_std_handles(void)
30493049

30503050
#if defined(_MSC_VER)
30513051

3052+
#ifdef _DEBUG
3053+
#include <crtdbg.h>
3054+
#endif
3055+
30523056
/*
30533057
* This routine sits between wmain() and "main" in git.exe.
30543058
* We receive UNICODE (wchar_t) values for argv and env.
@@ -3073,6 +3077,10 @@ int msc_startup(int argc, wchar_t **w_argv, wchar_t **w_env)
30733077
int maxlen;
30743078
int k, exit_status;
30753079

3080+
#ifdef _DEBUG
3081+
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
3082+
#endif
3083+
30763084
#ifdef USE_MSVC_CRTDBG
30773085
_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
30783086
#endif

0 commit comments

Comments
 (0)