Skip to content

Commit bc1e1f5

Browse files
committed
Adjust to testsets and use static macro
1 parent 85289ad commit bc1e1f5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/DistributedArrays.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ end
658658

659659
# We also want to optimize setindex! with a SubDArray source, but this is hard
660660
# and only works on 0.5.
661-
if VERSION > v"0.5.0-dev+5230"
661+
@static if VERSION > v"0.5.0-dev+5230"
662662
# Similar to Base.indexin, but just create a logical mask. Note that this
663663
# must return a logical mask in order to support merging multiple masks
664664
# together into one linear index since we need to know how many elements to

test/darray.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,20 @@ check_leaks()
101101
close(D2)
102102

103103
S2 = convert(Vector{Float64}, D[4, 23:176])
104-
@fact A[4, 23:176] --> S2
104+
@test A[4, 23:176] == S2
105105

106106
S3 = convert(Vector{Float64}, D[23:176, 197])
107-
@fact A[23:176, 197] --> S3
107+
@test A[23:176, 197] == S3
108108

109109
S4 = zeros(4)
110110
setindex!(S4, D[3:4, 99:100], :)
111-
@fact S4 --> vec(D[3:4, 99:100])
112-
@fact S4 --> vec(A[3:4, 99:100])
113-
111+
@test S4 == vec(D[3:4, 99:100])
112+
@test S4 == vec(A[3:4, 99:100])
113+
114114
S5 = zeros(2,2)
115115
setindex!(S5, D[1,1:4], :, 1:2)
116-
@fact vec(S5) --> D[1, 1:4]
117-
@fact vec(S5) --> A[1, 1:4]
116+
@test vec(S5) == D[1, 1:4]
117+
@test vec(S5) == A[1, 1:4]
118118
end
119119
close(D)
120120
end

0 commit comments

Comments
 (0)