[libcxx-commits] [libcxx] cd1b8be - [libcxx] [test] Make set_windows_crt_report_mode.h more explicit

[Martin Storsjö via libcxx-commits]

Author: Andrew Ng
Date: 2023-07-28T23:51:27+03:00
New Revision: cd1b8be8de91bc1c43bac3eea7ebf3b5643b031c

URL: https://github.com/llvm/llvm-project/commit/cd1b8be8de91bc1c43bac3eea7ebf3b5643b031c
DIFF: https://github.com/llvm/llvm-project/commit/cd1b8be8de91bc1c43bac3eea7ebf3b5643b031c.diff

LOG: [libcxx] [test] Make set_windows_crt_report_mode.h more explicit

This header is included when building with a debug CRT in
MSVC/Clang-cl environments. By default, failed asserts with the
debug CRT pops up a blocking dialog box alerting the user about
the failed assert. When running more than one test in an automated
fashion, this isn't ideal.

This header tries to run initializers to set the behaviour of the
failed asserts to print a message to the console, just like the
default is in release mode.

This is previously done by setting the reporting mode to
_CRTDBG_MODE_DEBUG, which means outputting to the debugger's
output window. In some setups, this is enough for making it work,
but in others it instead can pop up a dialog asking for which
debugger to use.

Instead set the mode explicitly to _CRTDBG_MODE_FILE and set the
destination to be explicitly to stderr.

For setups where the previous code worked correctly, it doesn't make
any difference other than that a failed assert prints an additional
"abort() has been called" message that wasn't printed before.

Differential Revision: https://reviews.llvm.org/D155823

Added: 
    

Modified: 
    libcxx/test/support/set_windows_crt_report_mode.h

Removed: 
    


################################################################################
diff  --git a/libcxx/test/support/set_windows_crt_report_mode.h b/libcxx/test/support/set_windows_crt_report_mode.h
index b647eaf25bd769..d8dd244ca2a321 100644
--- a/libcxx/test/support/set_windows_crt_report_mode.h
+++ b/libcxx/test/support/set_windows_crt_report_mode.h
@@ -33,9 +33,12 @@
 // that setting and instead changes the assertion handler to log to stderr
 // instead.
 inline int init_crt_report_mode() {
-  _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG);
-  _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG);
-  _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+  _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
+  _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+  _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE);
+  _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR);
+  _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
+  _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
   return 0;
 }