Skip to content

Commit

Permalink
Fix tests for 32bit machines
Browse files Browse the repository at this point in the history
  • Loading branch information
tkf committed Mar 11, 2021
1 parent 58742eb commit 5239b25
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion test/broadcast.jl
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ p0 = copy(p)
@test isequal(tuple.([1, 2], [3.0, missing]), [(1, 3.0), (2, missing)])
@test Core.Compiler.return_type(broadcast, Tuple{typeof(tuple), Vector{Int},
Vector{Union{Float64, Missing}}}) ==
Union{Vector{Tuple{Int64, Missing}}, Vector{Tuple{Int64, Any}}, Vector{Tuple{Int64, Float64}}}
Union{Vector{Tuple{Int, Missing}}, Vector{Tuple{Int, Any}}, Vector{Tuple{Int, Float64}}}
# Check that corner cases do not throw an error
@test isequal(broadcast(x -> x === 1 ? nothing : x, [1, 2, missing]),
[nothing, 2, missing])
Expand Down
4 changes: 2 additions & 2 deletions test/compiler/inference.jl
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ tmerge_test(Tuple{}, Tuple{Complex, Vararg{Union{ComplexF32, ComplexF64}}},
@test Core.Compiler.tmerge(Union{Nothing, Tuple{}, Tuple{ComplexF32}}, Union{Nothing, Tuple{ComplexF32, ComplexF32}}) ==
Union{Nothing, Tuple{Vararg{ComplexF32}}}
@test Core.Compiler.tmerge(Vector{Int}, Core.Compiler.tmerge(Vector{String}, Vector{Bool})) ==
Union{Vector{Bool}, Vector{Int64}, Vector{String}}
Union{Vector{Bool}, Vector{Int}, Vector{String}}
@test Core.Compiler.tmerge(Vector{Int}, Core.Compiler.tmerge(Vector{String}, Union{Vector{Bool}, Vector{Symbol}})) == Vector
@test Core.Compiler.tmerge(Base.BitIntegerType, Union{}) === Base.BitIntegerType
@test Core.Compiler.tmerge(Union{}, Base.BitIntegerType) === Base.BitIntegerType
Expand Down Expand Up @@ -3217,4 +3217,4 @@ end
else
Some(0x2)
end
end == [Union{Some{Float64}, Some{Int64}, Some{UInt8}}]
end == [Union{Some{Float64}, Some{Int}, Some{UInt8}}]

0 comments on commit 5239b25

Please sign in to comment.