Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kshyatt committed Jul 3, 2016
1 parent c9b6bc6 commit 8a17ddc
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions base/test.jl
Original file line number Diff line number Diff line change
Expand Up @@ -424,12 +424,12 @@ record(ts::DefaultTestSet, t::Broken) = (push!(ts.results, t); t)
# For the other result types, immediately print the error message
# but do not terminate. Print a backtrace.
function record(ts::DefaultTestSet, t::Union{Fail, Error})
if myid() == 0
if myid() == 1
print_with_color(:white, ts.description, ": ")
print(t)
# don't print the backtrace for Errors because it gets printed in the show
# method
isa(t, Error) || Base.show_backtrace(STDOUT, backtrace())
isa(t, Error) || Base.show_backtrace(STDERR, backtrace())
println()
end
push!(ts.results, t)
Expand Down
2 changes: 2 additions & 0 deletions test/loading.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file is a part of Julia. License is MIT: http://julialang.org/license



@test @__LINE__ == 5

include("test_sourcepath.jl")
Expand Down
4 changes: 3 additions & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ end
move_to_node1("compile")
move_to_node1("enums")
move_to_node1("docs")
move_to_node1("loading")
move_to_node1("subarray")
# In a constrained memory environment, run the parallel test after all other tests
# since it starts a lot of workers and can easily exceed the maximum memory
max_worker_rss != typemax(Csize_t) && move_to_node1("parallel")
Expand Down Expand Up @@ -72,7 +74,7 @@ cd(dirname(@__FILE__)) do
end
end
println()
Base.Test.print_test_results(o_ts,0)
Base.Test.print_test_results(o_ts,1)
for res in results
if !isa(res[2][1], Exception)
println("Tests for $(res[1]) took $(res[2][2]) seconds, of which $(res[2][4]) were spent in gc ($(100*res[2][4]/res[2][2]) % ), and allocated $(res[2][3]) bytes.")
Expand Down
2 changes: 0 additions & 2 deletions test/staged.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This file is a part of Julia. License is MIT: http://julialang.org/license

@testset "staged" begin
@generated function staged_t1(a,b)
if a == Int
return :(a+b)
Expand Down Expand Up @@ -206,4 +205,3 @@ let
decorate(bar)
@test in(typeof(bar), decorated)
end
end
2 changes: 0 additions & 2 deletions test/test_sourcepath.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This file is a part of Julia. License is MIT: http://julialang.org/license

@test "sourcepath" begin
# source path in tasks
path = Base.source_path()::String # this variable is leaked to the source script
@test endswith(path, joinpath("test","test_sourcepath.jl"))
Expand All @@ -17,4 +16,3 @@ end == path
end == path
@test isabspath(@__FILE__)

end
2 changes: 1 addition & 1 deletion test/testdefs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Base.Test

function runtests(name)
@printf(" \033[1m*\033[0m \033[31m%-21s\033[0m", name)
@printf(" \033[1m*\033[0m \033[31m%-21s\033[0m\n", name)
coolness = @timed @testset "$name" begin
include("$name.jl")
end
Expand Down
2 changes: 1 addition & 1 deletion test/tuple.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is a part of Julia. License is MIT: http://julialang.org/license
@testset "indexing" begin
@test length(()) != 0
@test length(()) == 0
@test length((1,)) === 1
@test length((1,2)) === 2

Expand Down

0 comments on commit 8a17ddc

Please sign in to comment.