Merge pull request #14117 from JuliaLang/ScottPJones-spj/redirectcompile

spj/redirectcompile

Author: tkelman

test/compile.jl

@@ -2,6 +2,13 @@
 
 using Base.Test
 
+function redirected_stderr()
+    rd, wr = redirect_stderr()
+    @async readall(rd) # make sure the kernel isn't being forced to buffer the output
+    nothing
+end
+
+olderr = STDERR
 dir = mktempdir()
 dir2 = mktempdir()
 insert!(LOAD_PATH, 1, dir)
@@ -32,8 +39,12 @@ try
 
     # use _require_from_serialized to ensure that the test fails if
     # the module doesn't load from the image:
-    println(STDERR, "\nNOTE: The following 'replacing module' warning indicates normal operation:")
-    @test nothing !== Base._require_from_serialized(myid(), Foo_module, true)
+    try
+        redirected_stderr()
+        @test nothing !== Base._require_from_serialized(myid(), Foo_module, #=broadcast-load=#false)
+    finally
+        redirect_stderr(olderr)
+    end
 
     let Foo = eval(Main, Foo_module)
         @test Foo.foo(17) == 18
@@ -57,8 +68,15 @@ try
           end
           """)
 
-    println(STDERR, "\nNOTE: The following 'LoadError: __precompile__(false)' indicates normal operation")
-    @test_throws ErrorException Base.compilecache("Baz") # from __precompile__(false)
+    try
+        redirected_stderr()
+        Base.compilecache("Baz") # from __precompile__(false)
+        error("__precompile__ disabled test failed")
+    catch exc
+        redirect_stderr(olderr)
+        isa(exc, ErrorException) || rethrow(exc)
+        !isempty(search(exc.msg, "__precompile__(false)")) && rethrow(exc)
+    end
 
     # Issue #12720
     FooBar_file = joinpath(dir, "FooBar.jl")
@@ -89,10 +107,19 @@ try
           end
           """)
 
-    println(STDERR, "\nNOTE: The following 'LoadError: break me' indicates normal operation")
-    @test_throws ErrorException Base.require(:FooBar)
-
+    try
+        redirected_stderr()
+        Base.require(:FooBar)
+        error("\"LoadError: break me\" test failed")
+    catch exc
+        redirect_stderr(olderr)
+        isa(exc, ErrorException) || rethrow(exc)
+        !isempty(search(exc.msg, "ERROR: LoadError: break me")) && rethrow(exc)
+    end
 finally
+    if STDERR != olderr
+        redirect_stderr(olderr)
+    end
     splice!(Base.LOAD_CACHE_PATH, 1:2)
     splice!(LOAD_PATH, 1)
     rm(dir, recursive=true)