From 279ec9b9b871dc6ef52ebc808adca177f596795e Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 27 May 2015 09:15:19 -0700 Subject: [PATCH] test: Join child threads on windows in tests Windows tests can often deadlock if a child thread continues after the main thread and then panics, and a `println!` executed in a child thread after the main thread has exited is at risk of panicking. --- src/test/run-pass/macro-with-braces-in-expr-position.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/test/run-pass/macro-with-braces-in-expr-position.rs b/src/test/run-pass/macro-with-braces-in-expr-position.rs index 4881a5ab647..326d1cafe6c 100644 --- a/src/test/run-pass/macro-with-braces-in-expr-position.rs +++ b/src/test/run-pass/macro-with-braces-in-expr-position.rs @@ -8,15 +8,13 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(std_misc)] - use std::thread; macro_rules! expr { ($e: expr) => { $e } } macro_rules! spawn { ($($code: tt)*) => { - expr!(thread::spawn(move|| {$($code)*})) + expr!(thread::spawn(move|| {$($code)*}).join()) } }