Merge pull request JuliaParallel#155 from JuliaParallel/eschnett/char

Avoid comparing Char and Int
mmesiti · Jun 3, 2016 · 571ec62 · 571ec62
2 parents cc185cf + 8f55009
commit 571ec62
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/test/test_allgather.jl b/test/test_allgather.jl
@@ -13,10 +13,12 @@ comm = MPI.COMM_WORLD
 for typ in MPI.MPIDatatype.types
     A = typ[MPI.Comm_rank(comm) + 1]
     C = allgather(A)
-    @test C == collect(1:MPI.Comm_size(comm))
+    @test typeof(C) === Vector{typ}
+    @test C == map(typ, collect(1:MPI.Comm_size(comm)))
     A = convert(typ,MPI.Comm_rank(comm) + 1)
     C = allgather(A)
-    @test C == collect(1:MPI.Comm_size(comm))
+    @test typeof(C) === Vector{typ}
+    @test C == map(typ, collect(1:MPI.Comm_size(comm)))
 end
 
 MPI.Finalize()
diff --git a/test/test_allgatherv.jl b/test/test_allgatherv.jl
@@ -18,7 +18,7 @@ Base.one(::Type{Char}) = '\01'
 for typ in MPI.MPIDatatype.types
 
     A = ones(typ, mod(rank,2) + 1)
-    counts = Cint[ mod(i,2) + 1 for i in 0:(size-1)]
+    counts = Cint[mod(i,2) + 1 for i in 0:(size-1)]
     B = allgatherv_array(A, counts)
     @test B == ones(typ, 3 * div(size,2) + mod(size,2))
 end

diff --git a/test/test_exscan.jl b/test/test_exscan.jl
@@ -14,7 +14,7 @@ for typ in typs
     val = convert(typ,rank+1)
     B = MPI.Exscan(val, MPI.PROD, comm)
     if rank > 0
-        @test_approx_eq B[1] factorial(rank)
+        @test B[1] === convert(typ, factorial(rank))
     end
 end
 

diff --git a/test/test_gather.jl b/test/test_gather.jl
@@ -15,12 +15,14 @@ for typ in MPI.MPIDatatype.types
     A = typ[MPI.Comm_rank(comm) + 1]
     C = gather(A, root)
     if MPI.Comm_rank(comm) == root
-        @test C == collect(1:MPI.Comm_size(comm))
+        @test typeof(C) === Vector{typ}
+        @test C == map(typ, collect(1:MPI.Comm_size(comm)))
     end
     A = convert(typ,MPI.Comm_rank(comm) + 1)
     C = gather(A, root)
     if MPI.Comm_rank(comm) == root
-        @test C == collect(1:MPI.Comm_size(comm))
+        @test typeof(C) === Vector{typ}
+        @test C == map(typ, collect(1:MPI.Comm_size(comm)))
     end
 end