From af2b7e488229c8f009445b1cb2751d0a028527cc Mon Sep 17 00:00:00 2001
From: Tim Besard <tim.besard@gmail.com>
Date: Fri, 19 Aug 2016 09:53:20 -0400
Subject: [PATCH] Expose MEMDEBUG, and use it to fix the #14173 test

---
 src/intrinsics.cpp | 8 ++++++++
 test/misc.jl       | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/intrinsics.cpp b/src/intrinsics.cpp
index 444a76b853f7d..1d9844e20e944 100644
--- a/src/intrinsics.cpp
+++ b/src/intrinsics.cpp
@@ -50,6 +50,14 @@ JL_DLLEXPORT uint32_t jl_get_LLVM_VERSION(void)
         ;
 }
 
+extern "C" JL_DLLEXPORT int8_t jl_is_memdebug() {
+#ifdef MEMDEBUG
+    return true;
+#else
+    return false;
+#endif
+}
+
 /*
   low-level intrinsics design: TODO: fix description below
   functions like add_int expect unboxed values of matching bit-length.
diff --git a/test/misc.jl b/test/misc.jl
index bf3795ffb8051..e91c3ca135b8c 100644
--- a/test/misc.jl
+++ b/test/misc.jl
@@ -230,7 +230,8 @@ module Tmp14173
     A = randn(2000, 2000)
 end
 whos(IOBuffer(), Tmp14173) # warm up
-@test @allocated(whos(IOBuffer(), Tmp14173)) < 10000
+const MEMDEBUG = ccall(:jl_is_memdebug, Bool, ())
+@test @allocated(whos(IOBuffer(), Tmp14173)) < (MEMDEBUG ? 20000 : 8000)
 
 ## test conversion from UTF-8 to UTF-16 (for Windows APIs)