fix #11017

JuliaLang · Jul 18, 2015 · 72973d8 · 72973d8
1 parent 4dae997
commit 72973d8
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/deps/checksums/libuv-28f5f06b5ff6f010d666ec26552e0badaca5cdcd.tar.gz/md5 b/deps/checksums/libuv-28f5f06b5ff6f010d666ec26552e0badaca5cdcd.tar.gz/md5
@@ -0,0 +1 @@
+429c128e55147c8b43d6555fe406869b
diff --git a/deps/checksums/libuv-28f5f06b5ff6f010d666ec26552e0badaca5cdcd.tar.gz/sha512 b/deps/checksums/libuv-28f5f06b5ff6f010d666ec26552e0badaca5cdcd.tar.gz/sha512
@@ -0,0 +1 @@
+c80390c970cebded5a444cabce95e80314f10c56aa59a37c67f9221ba69d1ebe8ece2d524abb71d83aa7d239e92149171bc2f7428f4efe9a7e259ab2b019b871
diff --git a/deps/checksums/libuv-abcbb0c22faa527c427e1ea6b55f073836b26f69.tar.gz/md5 b/deps/checksums/libuv-abcbb0c22faa527c427e1ea6b55f073836b26f69.tar.gz/md5
diff --git a/deps/checksums/libuv-abcbb0c22faa527c427e1ea6b55f073836b26f69.tar.gz/sha512 b/deps/checksums/libuv-abcbb0c22faa527c427e1ea6b55f073836b26f69.tar.gz/sha512
diff --git a/deps/libuv.version b/deps/libuv.version
@@ -1,2 +1,2 @@
 LIBUV_BRANCH=julia-uv0.11.26
-LIBUV_SHA1=abcbb0c22faa527c427e1ea6b55f073836b26f69
+LIBUV_SHA1=28f5f06b5ff6f010d666ec26552e0badaca5cdcd
diff --git a/src/init.c b/src/init.c
@@ -637,7 +637,9 @@ DLLEXPORT void jl_atexit_hook()
             item = next_shutdown_queue_item(item);
         }
     }
-    uv_run(loop,UV_RUN_DEFAULT); //let libuv spin until everything has finished closing
+    // force libuv to spin until everything has finished closing
+    loop->stop_flag = 0;
+    while (uv_run(loop,UV_RUN_DEFAULT)) {}
 }
 
 void jl_get_builtin_hooks(void);

diff --git a/test/misc.jl b/test/misc.jl
@@ -111,7 +111,7 @@ immutable NoMethodHasThisType end
 
 # PR #10984
 # Disable on windows because of issue (missing flush) when redirecting STDERR.
-@unix_only let
+let
     redir_err = "redirect_stderr(STDOUT)"
     exename = joinpath(JULIA_HOME, Base.julia_exename())
     script = "$redir_err; f(a::Number, b...) = 1;f(a, b::Number) = 1"