fix tests

Author: simonbyrne

.appveyor.yml

@@ -2,7 +2,6 @@ environment:
   matrix:
   - julia_version: 1.3
   - julia_version: 1.4
-  - julia_version: 1.5
   - julia_version: nightly
 
 platform:

.travis.yml

@@ -8,7 +8,6 @@ os:
 julia:
   - 1.3
   - 1.4
-  - 1.5
   - nightly
 
 branches:

Project.toml

@@ -10,8 +10,8 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 
 [compat]
-julia = "1"
 MPI = "0.14"
+julia = "1"
 
 [extras]
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

test/runtests.jl

@@ -1,42 +1,23 @@
 using Pkg
 pkg"precompile"
 
-using MPIClusterManagers: mpiexec
-using Test
+using Test, MPI
 
-# Code coverage command line options; must correspond to src/julia.h
-# and src/ui/repl.c
-const JL_LOG_NONE = 0
-const JL_LOG_USER = 1
-const JL_LOG_ALL = 2
-const coverage_opts =
-    Dict{Int, String}(JL_LOG_NONE => "none",
-                      JL_LOG_USER => "user",
-                      JL_LOG_ALL => "all")
+nprocs = clamp(Sys.CPU_THREADS, 2, 4)
 
-function runtests()
-    nprocs = clamp(Sys.CPU_THREADS, 2, 4)
-    exename = joinpath(Sys.BINDIR, Base.julia_exename())
-    extra_args = []
-    @static if !Sys.iswindows()
-        if occursin( "OpenRTE", read(`$mpiexec --version`, String))
-            push!(extra_args,"--oversubscribe")
-        end
-    end
-
-    coverage_opt = coverage_opts[Base.JLOptions().code_coverage]
-
-    jlexec = `$exename --code-coverage=$coverage_opt`
-    mpijlexec = `$mpiexec $extra_args -n $nprocs $jlexec`
-
-    @info "Testing: test_cman_julia.jl"
-    run(`$jlexec $(joinpath(@__DIR__, "test_cman_julia.jl"))`)
+@info "Testing: test_cman_julia.jl"
+run(`$(Base.julia_cmd()) $(joinpath(@__DIR__, "test_cman_julia.jl")) $nprocs`)
 
+if VERSION >= v"1.5"
     @info "Testing: test_cman_mpi.jl"
-    run(`$mpijlexec $(joinpath(@__DIR__, "test_cman_mpi.jl"))`)
-
-    @info "Testing: test_cman_tcp.jl"
-    run(`$mpijlexec $(joinpath(@__DIR__, "test_cman_tcp.jl"))`)
+    mpiexec() do cmd
+        run(`$cmd -n $nprocs $(Base.julia_cmd()) $(joinpath(@__DIR__, "test_cman_mpi.jl"))`)
+    end
+else
+    @warn "MPI_TRANSPORT_ALL broken on Julia versions < 1.5\nSee https://github.com/JuliaParallel/MPIClusterManagers.jl/issues/9"
 end
 
-runtests()
+@info "Testing: test_cman_tcp.jl"
+mpiexec() do cmd
+    run(`$cmd -n $nprocs $(Base.julia_cmd()) $(joinpath(@__DIR__, "test_cman_tcp.jl"))`)
+end

test/test_cman_julia.jl

@@ -2,16 +2,13 @@ using Test
 using MPIClusterManagers
 using Distributed
 
-using MPIClusterManagers: mpiexec
 import MPI
 
 # Start workers via `mpiexec` that communicate among themselves via MPI;
 # communicate with the workers via TCP
-if !Sys.iswindows() && occursin( "OpenRTE", open(f->read(f, String),`$mpiexec --version`))
-    mgr = MPIManager(np=4, mpirun_cmd=`$mpiexec --oversubscribe -n 4`)
-else
-    mgr = MPIManager(np=4)
-end
+nprocs = parse(Int, ARGS[1])
+
+mgr = MPIManager(np=nprocs)
 addprocs(mgr)
 
 refs = []