Skip to content

Commit

Permalink
Rebase to latest master
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottPJones committed Sep 29, 2015
1 parent a1b69ca commit 94797e7
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions test/compile.jl
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,10 @@ try
# use _require_from_serialized to ensure that the test fails if
# the module doesn't load from the image:
try
println(STDERR, "Start STDERR redirection")
rd, wr = redirect_stderr()
@test nothing !== Base._require_from_serialized(myid(), Foo_module, true)
sleep(5)
redirect_stderr(olderr)
println(STDERR, "Finished STDERR redirection")
catch exc
redirect_stderr(olderr)
rethow(exc)
Expand All @@ -59,7 +57,6 @@ try
@test map(x -> x[1], sort(deps[2])) == [Foo_file,joinpath(dir,"bar.jl"),joinpath(dir,"foo.jl")]
end

println(STDERR, "Test __precompile__(false)")
Baz_file = joinpath(dir, "Baz.jl")
open(Baz_file, "w") do f
print(f, """
Expand Down Expand Up @@ -95,22 +92,16 @@ try
@test_throws ErrorException Base.require(:FooBar)
olderr = STDERR
try
println(STDERR, "Redirecting STDERR")
rd, wr = redirect_stderr()
println("Call Base.compilecache")
Base.compilecache("Baz") # from __precompile__(false)
error("test failed: Base.compilecache did not throw anything")
catch exc
println("Caught exception: $exc")
redirect_stderr(olderr)
isa(exc, ErrorException) || rethrow(exc)
search(exc.msg, "__precompile__(false)") == 0 && rethrow(exc)
end
finally
println("Finally call")
if STDERR != olderr
redirect_stderr(olderr)
println("Redirected stderr")
end
splice!(Base.LOAD_CACHE_PATH, 1)
splice!(LOAD_PATH, 1)
Expand Down

0 comments on commit 94797e7

Please sign in to comment.