[16/17] msvc: avoid debug assertion windows in Debug Mode

Message ID	831d603e2518894fe66b70089a296b5d11a9870f.1560860634.git.gitgitgadget@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Date: Tue, 18 Jun 2019 05:24:06 -0700 (PDT) Message-Id: <831d603e2518894fe66b70089a296b5d11a9870f.1560860634.git.gitgitgadget@gmail.com> In-Reply-To: <pull.149.git.gitgitgadget@gmail.com> References: <pull.149.git.gitgitgadget@gmail.com> From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> Subject: [PATCH 16/17] msvc: avoid debug assertion windows in Debug Mode Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Johannes Schindelin <johannes.schindelin@gmx.de> Sender: git-owner@vger.kernel.org Precedence: bulk
Series	Fix MSVC support, at long last \| expand [00/17] Fix MSVC support, at long last [02/17] t0001 (mingw): do not expect a specific order of stdout/stderr [03/17] cache-tree.c: avoid reusing the DEBUG constant [04/17] obstack: fix compiler warning [05/17] mingw: replace mingw_startup() hack [06/17] msvc: fix dependencies of compat/msvc.c [07/17] msvc: include sigset_t definition [08/17] msvc: define O_ACCMODE [09/17] msvc: mark a variable as non-const [10/17] msvc: do not re-declare the timespec struct [11/17] msvc: define ftello() [12/17] msvc: fix detect_msys_tty() [13/17] msvc: support building Git using MS Visual C++ [14/17] msvc: add pragmas for common warnings [15/17] msvc: do not pretend to support all signals [16/17] msvc: avoid debug assertion windows in Debug Mode [17/17] msvc: ignore .dll and incremental compile output

Message ID

831d603e2518894fe66b70089a296b5d11a9870f.1560860634.git.gitgitgadget@gmail.com (mailing list archive)

State

New, archived

Headers

Date: Tue, 18 Jun 2019 05:24:06 -0700 (PDT)
Message-Id: 
 <831d603e2518894fe66b70089a296b5d11a9870f.1560860634.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.149.git.gitgitgadget@gmail.com>
References: <pull.149.git.gitgitgadget@gmail.com>
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Subject: [PATCH 16/17] msvc: avoid debug assertion windows in Debug Mode
Fcc: Sent
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
        Johannes Schindelin <johannes.schindelin@gmx.de>
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

Fix MSVC support, at long last | expand

Commit Message

John Passaro via GitGitGadget June 18, 2019, 12:24 p.m. UTC

From: Johannes Schindelin <johannes.schindelin@gmx.de>

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 <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compat/mingw.c b/compat/mingw.c
index 8b56aa5773..cdb99b940e 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2438,6 +2438,10 @@  int wmain(int argc, const wchar_t **wargv)
 	trace2_initialize_clock();
 
 #ifdef _MSC_VER
+#ifdef _DEBUG
+	_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+#endif
+
 #ifdef USE_MSVC_CRTDBG
 	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif

[16/17] msvc: avoid debug assertion windows in Debug Mode

Commit Message

Patch