Update the tests

Jeremy Edward Kozdon · Jeremy Edward Kozdon · commit a433ef1734b4 · 2018-06-15T15:46:14.000-07:00
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,5 +1,5 @@
 using MPI
-using Base.Test
+using Compat.Test
 
 using Compat
 import Compat.String
@@ -21,13 +21,20 @@ juliafiles = ["test_cman_julia.jl"]
 singlefiles = ["test_spawn.jl"]
 
 excludedfiles = []
-if is_windows()
-    excludedfiles = ["test_info.jl", "test_onesided.jl", "test_finalize_atexit.jl"]
+if Compat.Sys.iswindows()
+    push!(excludedfiles, "test_info.jl")
+    push!(excludedfiles, "test_onesided.jl")
+    push!(excludedfiles, "test_finalize_atexit.jl")
     if Sys.WORD_SIZE == 32
         push!(excludedfiles, "test_spawn.jl")
     end
 end
 
+if VERSION > v"0.7.0-DEV.2005"
+  push!(excludedfiles, "test_cman_julia.jl")
+  push!(excludedfiles, "test_cman_mpi.jl")
+  push!(excludedfiles, "test_cman_tcp.jl")
+end
 function runtests()
     nprocs = clamp(Sys.CPU_CORES, 2, 4)
     exename = joinpath(BINDIR, Base.julia_exename())
@@ -36,14 +43,14 @@ function runtests()
     testfiles = sort(filter(istest, readdir(testdir)))
 
     extra_args = []
-    @static if !is_windows()
-        if contains(readlines(open(`mpiexec --version`)[1])[1], "OpenRTE")
+    @static if !Compat.Sys.iswindows()
+      if Compat.occursin( "OpenRTE", Compat.open(f->read(f, String),`mpiexec --version`))
             push!(extra_args,"--oversubscribe")
         end
     end
 
     nfail = 0
-    print_with_color(:white, "Running MPI.jl tests\n")
+    Compat.printstyled("Running MPI.jl tests\n"; color=:white)
     for f in testfiles
         if f ∈ excludedfiles
             println("Skipping disabled test $f")
@@ -58,11 +65,11 @@ function runtests()
             else
                 run(`mpiexec $extra_args -n $nprocs $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
             end
-            Base.with_output_color(:green,STDOUT) do io
+            Base.with_output_color(:green,Compat.stdout) do io
                 println(io,"\tSUCCESS: $f")
             end
         catch ex
-            Base.with_output_color(:red,STDERR) do io
+            Base.with_output_color(:red,Compat.stderr) do io
                 println(io,"\tError: $(joinpath(testdir, f))")
                 showerror(io,ex,backtrace())
             end
diff --git a/test/spawned_worker.jl b/test/spawned_worker.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using MPI
 
 MPI.Init()
diff --git a/test/test_allgather.jl b/test/test_allgather.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using MPI
 
 MPI.Init()
@@ -10,7 +10,7 @@ end
 
 comm = MPI.COMM_WORLD
 
-for typ in (isdefined(:UnionAll) ? Base.uniontypes(MPI.MPIDatatype) : MPI.MPIDatatype.types)
+for typ in Base.uniontypes(MPI.MPIDatatype)
     A = typ[MPI.Comm_rank(comm) + 1]
     C = allgather(A)
     @test typeof(C) === Vector{typ}
diff --git a/test/test_allgatherv.jl b/test/test_allgatherv.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using MPI
 
 MPI.Init()
@@ -15,7 +15,7 @@ rank = MPI.Comm_rank(comm)
 # Defining this to make ones work for Char
 Base.one(::Type{Char}) = '\01'
 
-for typ in (isdefined(:UnionAll) ? Base.uniontypes(MPI.MPIDatatype) : MPI.MPIDatatype.types)
+for typ in Base.uniontypes(MPI.MPIDatatype)
 
     A = ones(typ, mod(rank,2) + 1)
     counts = Cint[mod(i,2) + 1 for i in 0:(size-1)]
diff --git a/test/test_allreduce.jl b/test/test_allreduce.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using MPI
 
 MPI.Init()
diff --git a/test/test_alltoall.jl b/test/test_alltoall.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 
 using MPI
 
diff --git a/test/test_alltoallv.jl b/test/test_alltoallv.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using MPI
 
 MPI.Init()
@@ -12,7 +12,7 @@ comm = MPI.COMM_WORLD
 size = MPI.Comm_size(comm)
 rank = MPI.Comm_rank(comm)
 
-for typ in (isdefined(:UnionAll) ? Base.uniontypes(MPI.MPIDatatype) : MPI.MPIDatatype.types)
+for typ in Base.uniontypes(MPI.MPIDatatype)
     A = typ[]
     B = typ[]
     for i in 1:size
diff --git a/test/test_basic.jl b/test/test_basic.jl
@@ -1,4 +1,5 @@
-using Base.Test
+using Compat
+using Compat.Test
 using MPI
 
 @test !MPI.Initialized()
@@ -7,7 +8,7 @@ MPI.Init()
 
 @test MPI.Comm(MPI.CComm(MPI.COMM_WORLD)).val == MPI.COMM_WORLD.val
 
-if !is_windows()
+if !Compat.Sys.iswindows()
     MPI.finalize_atexit()
     @test MPI.FINALIZE_ATEXIT[]
 end
diff --git a/test/test_bcast.jl b/test/test_bcast.jl
@@ -1,4 +1,5 @@
-using Base.Test
+using Compat.Test
+using Compat.Random
 using MPI
 
 MPI.Init()
@@ -21,7 +22,7 @@ root = 0
 srand(17)
 
 matsize = (17,17)
-for typ in (isdefined(:UnionAll) ? Base.uniontypes(MPI.MPIDatatype) : MPI.MPIDatatype.types)
+for typ in Base.uniontypes(MPI.MPIDatatype)
     A = rand(typ, matsize...)
     @test bcast_array(A, root) == A
 end
diff --git a/test/test_cman_julia.jl b/test/test_cman_julia.jl
@@ -1,9 +1,11 @@
-using Base.Test
+using Compat
+using Compat.Test
 using MPI
+using Compat.Distributed
 
 # Start workers via `mpiexec` that communicate among themselves via MPI;
 # communicate with the workers via TCP
-if !is_windows() && contains(readlines(open(`mpiexec --version`)[1])[1], "OpenRTE")
+if !Compat.Sys.iswindows() && Compat.occursin( "OpenRTE", Compat.open(f->read(f, String),`mpiexec --version`))
     mgr = MPI.MPIManager(np=4, mpirun_cmd=`mpiexec --oversubscribe -n 4`)
 else
     mgr = MPI.MPIManager(np=4)
diff --git a/test/test_cman_mpi.jl b/test/test_cman_mpi.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using MPI
 
 # This uses MPI to communicate with the workers
diff --git a/test/test_cman_tcp.jl b/test/test_cman_tcp.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using MPI
 
 # This uses TCP to communicate with the workers
diff --git a/test/test_comm.jl b/test/test_comm.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using MPI
 
 MPI.Init()
diff --git a/test/test_datatype.jl b/test/test_datatype.jl
@@ -1,4 +1,5 @@
-using Base.Test
+using Compat
+using Compat.Test
 using MPI
 
 MPI.Init()
@@ -32,15 +33,15 @@ end
 
 MPI.mpitype(Boundary)
 
-arr = Array{Boundary}(3)
+arr = Array{Boundary}(undef, 3)
 for i=1:3
   arr[i] = Boundary( (comm_rank + i) % 127, i + comm_rank, i % 64)
 end
 
 req_send = MPI.Isend(arr, dest - 1, 1, MPI.COMM_WORLD)
 
 # receive the message
-arr_recv = Array{Boundary}(3)
+arr_recv = Array{Boundary}(undef, 3)
 req_recv = MPI.Irecv!(arr_recv, src - 1, 1, MPI.COMM_WORLD)
 
 MPI.Wait!(req_send)
@@ -63,8 +64,8 @@ end
 
 MPI.mpitype(Boundary2)
 
-arr = Array{Boundary2}(3)
-arr_recv = Array{Boundary2}(3)
+arr = Array{Boundary2}(undef,3)
+arr_recv = Array{Boundary2}(undef,3)
 
 for i=1:3
   arr[i] = Boundary2( (comm_rank + i) % 127, ( Int(i + comm_rank), UInt8(i % 64) ) )
diff --git a/test/test_exscan.jl b/test/test_exscan.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 
 using MPI
 
@@ -9,12 +9,12 @@ size = MPI.Comm_size(comm)
 rank = MPI.Comm_rank(comm)
 
 # Not possible to PROD a Char (and neither Int8 with OpenMPI)
-typs = setdiff([(isdefined(:UnionAll) ? Base.uniontypes(MPI.MPIDatatype) : MPI.MPIDatatype.types)...], [Char, Int8, UInt8])
+typs = setdiff([Base.uniontypes(MPI.MPIDatatype)...], [Char, Int8, UInt8])
 for typ in typs
     val = convert(typ,rank+1)
     B = MPI.Exscan(val, MPI.PROD, comm)
     if rank > 0
-        @test B[1] === convert(typ, factorial(rank))
+        @test B[1] === convert(typ, prod(1:rank))
     end
 end
 
diff --git a/test/test_gather.jl b/test/test_gather.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using MPI
 
 MPI.Init()
@@ -11,7 +11,7 @@ end
 comm = MPI.COMM_WORLD
 root = 0
 
-for typ in (isdefined(:UnionAll) ? Base.uniontypes(MPI.MPIDatatype) : MPI.MPIDatatype.types)
+for typ in Base.uniontypes(MPI.MPIDatatype)
     A = typ[MPI.Comm_rank(comm) + 1]
     C = gather(A, root)
     if MPI.Comm_rank(comm) == root
diff --git a/test/test_gatherv.jl b/test/test_gatherv.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using MPI
 
 MPI.Init()
@@ -16,7 +16,7 @@ root = 0
 # Defining this to make ones work for Char
 Base.one(::Type{Char}) = '\01'
 
-for typ in (isdefined(:UnionAll) ? Base.uniontypes(MPI.MPIDatatype) : MPI.MPIDatatype.types)
+for typ in Base.uniontypes(MPI.MPIDatatype)
 
     A = ones(typ, mod(rank,2) + 1)
     counts = Cint[ mod(i,2) + 1 for i in 0:(size-1)]
diff --git a/test/test_info.jl b/test/test_info.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 using MPI
 
 MPI.Init()
diff --git a/test/test_onesided.jl b/test/test_onesided.jl
@@ -1,4 +1,5 @@
-using Base.Test
+using Compat
+using Compat.Test
 using MPI
 
 MPI.Init()
@@ -89,7 +90,7 @@ MPI.Win_create_dynamic(MPI.INFO_NULL, comm, win)
 MPI.Win_attach(win, buf)
 
 address_win = MPI.Win()
-address_buf = Vector{Cptrdiff_t}(1)
+address_buf = Vector{Cptrdiff_t}(undef, 1)
 MPI.Win_create(address_buf, MPI.INFO_NULL, comm, address_win)
 
 # Address for dynamic window is global instead of relative to the start of the buffer, so we need to share it
diff --git a/test/test_reduce.jl b/test/test_reduce.jl
@@ -1,6 +1,7 @@
-using Base.Test
+using Compat.Test
 
 using MPI
+using Compat.LinearAlgebra
 
 MPI.Init()
 
diff --git a/test/test_scan.jl b/test/test_scan.jl
@@ -1,4 +1,4 @@
-using Base.Test
+using Compat.Test
 
 using MPI
 
@@ -9,11 +9,11 @@ size = MPI.Comm_size(comm)
 rank = MPI.Comm_rank(comm)
 
 # Not possible to PROD a Char (and neither Int8 with OpenMPI)
-typs = setdiff([(isdefined(:UnionAll) ? Base.uniontypes(MPI.MPIDatatype) : MPI.MPIDatatype.types)...], [Char, Int8, UInt8])
+typs = setdiff([(Base.uniontypes(MPI.MPIDatatype))...], [Char, Int8, UInt8])
 for typ in typs
     val = convert(typ,rank + 1)
     B = MPI.Scan(val, MPI.PROD, comm)
-    @test B[1] ≈ factorial(val)
+    @test B[1] ≈ convert(typ, prod(1:(rank+1)))
 end
 
 MPI.Finalize()
diff --git a/test/test_scatter.jl b/test/test_scatter.jl
@@ -1,4 +1,5 @@
-using Base.Test
+using Compat
+using Compat.Test
 using MPI
 
 MPI.Init()
@@ -7,9 +8,9 @@ function scatter_array(A, root)
     comm = MPI.COMM_WORLD
     T = eltype(A)
     if MPI.Comm_rank(comm) == root
-        B = copy(A)
+        global B = copy(A)
     else
-        B = Array{T}(1)
+        global B = Array{T}(undef,1)
     end
     C = MPI.Scatter(B, 1, root, comm)
 end
@@ -20,9 +21,9 @@ root = 0
 A = collect(1:MPI.Comm_size(comm))
 B = scatter_array(A, root)
 @test B[1] == MPI.Comm_rank(comm) + 1
-for typ in (isdefined(:UnionAll) ? Base.uniontypes(MPI.MPIDatatype) : MPI.MPIDatatype.types)
-    A = convert(Vector{typ},collect(1:MPI.Comm_size(comm)))
-    B = scatter_array(A, root)
+for typ in Base.uniontypes(MPI.MPIDatatype)
+    global A = convert(Vector{typ},collect(1:MPI.Comm_size(comm)))
+    global B = scatter_array(A, root)
     @test B[1] == convert(typ,MPI.Comm_rank(comm) + 1)
 end
 
diff --git a/test/test_scatterv.jl b/test/test_scatterv.jl
@@ -1,4 +1,5 @@
-using Base.Test
+using Compat
+using Compat.Test
 using MPI
 
 MPI.Init()
@@ -9,7 +10,7 @@ function scatterv_array(A, counts::Vector{Cint}, root)
     if MPI.Comm_rank(comm) == root
         B = copy(A)
     else
-        B = Array{T}(1)
+        B = Array{T}(undef,1)
     end
     C = MPI.Scatterv(B, counts, root, comm)
 end
@@ -22,7 +23,7 @@ root = 0
 # Defining this to make ones work for Char
 Base.one(::Type{Char}) = '\01'
 
-for typ in (isdefined(:UnionAll) ? Base.uniontypes(MPI.MPIDatatype) : MPI.MPIDatatype.types)
+for typ in Base.uniontypes(MPI.MPIDatatype)
 
     A = ones(typ, 3 * div(size,2) + mod(size,2))
     counts = Cint[ mod(i,2) + 1 for i in 0:(size-1)]
diff --git a/test/test_sendrecv.jl b/test/test_sendrecv.jl
diff --git a/test/test_spawn.jl b/test/test_spawn.jl
diff --git a/test/test_test.jl b/test/test_test.jl
diff --git a/test/test_wait.jl b/test/test_wait.jl

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Base.Test`
	`1`	`+using Compat.Test`
`2`	`2`	`using MPI`
`3`	`3`
`4`	`4`	`MPI.Init()`