about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-10 22:08:20 +0000
committerbors <bors@rust-lang.org>2016-12-10 22:08:20 +0000
commitf82b7cbc1081ebf9a9026616608b7097ea166e35 (patch)
treec1a782a9f1c48834dead78708624df0110f040ea
parentc79d0b40a0e3e9f87ea022054577c5766b36e819 (diff)
parent6404143d8a36c9076cac89b3c386051b130f54c1 (diff)
downloadrust-f82b7cbc1081ebf9a9026616608b7097ea166e35.tar.gz
rust-f82b7cbc1081ebf9a9026616608b7097ea166e35.zip
Auto merge of #38231 - vadimcn:errormode, r=alexcrichton
Prevent Windows from displaying UI on errors.

Otherwise tests like run-pass/out-of-stack get wedged on Windows error reporting dialog (unless error reporting has been disabled, of course).
-rw-r--r--src/bootstrap/job.rs11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/bootstrap/job.rs b/src/bootstrap/job.rs
index b4d7aff97da..c3859275e6f 100644
--- a/src/bootstrap/job.rs
+++ b/src/bootstrap/job.rs
@@ -51,6 +51,7 @@ type LPVOID = *mut u8;
 type JOBOBJECTINFOCLASS = i32;
 type SIZE_T = usize;
 type LARGE_INTEGER = i64;
+type UINT = u32;
 type ULONG_PTR = usize;
 type ULONGLONG = u64;
 
@@ -59,6 +60,8 @@ const DUPLICATE_SAME_ACCESS: DWORD = 0x2;
 const PROCESS_DUP_HANDLE: DWORD = 0x40;
 const JobObjectExtendedLimitInformation: JOBOBJECTINFOCLASS = 9;
 const JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE: DWORD = 0x2000;
+const SEM_FAILCRITICALERRORS: UINT = 0x0001;
+const SEM_NOGPFAULTERRORBOX: UINT = 0x0002;
 
 extern "system" {
     fn CreateJobObjectW(lpJobAttributes: *mut u8, lpName: *const u8) -> HANDLE;
@@ -79,6 +82,7 @@ extern "system" {
                                JobObjectInformationClass: JOBOBJECTINFOCLASS,
                                lpJobObjectInformation: LPVOID,
                                cbJobObjectInformationLength: DWORD) -> BOOL;
+    fn SetErrorMode(mode: UINT) -> UINT;
 }
 
 #[repr(C)]
@@ -115,6 +119,13 @@ struct JOBOBJECT_BASIC_LIMIT_INFORMATION {
 }
 
 pub unsafe fn setup() {
+    // Tell Windows to not show any UI on errors (such as not finding a required dll
+    // during startup or terminating abnormally).  This is important for running tests,
+    // since some of them use abnormal termination by design.
+    // This mode is inherited by all child processes.
+    let mode = SetErrorMode(SEM_NOGPFAULTERRORBOX); // read inherited flags
+    SetErrorMode(mode | SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
+
     // Create a new job object for us to use
     let job = CreateJobObjectW(0 as *mut _, 0 as *const _);
     assert!(job != 0 as *mut _, "{}", io::Error::last_os_error());