Skip to content

Commit fb94cc5

Browse files
committed
remove excluded tests, fail on first error
1 parent f689ed5 commit fb94cc5

File tree

1 file changed

+11
-27
lines changed

1 file changed

+11
-27
lines changed

test/runtests.jl

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ juliafiles = ["test_cman_julia.jl"]
1616
# Files to run with mpiexec -n 1
1717
singlefiles = ["test_spawn.jl"]
1818

19-
excludedfiles = String[]
20-
if Sys.iswindows()
21-
end
22-
2319
function runtests()
2420
nprocs = clamp(Sys.CPU_THREADS, 2, 4)
2521
exename = joinpath(Sys.BINDIR, Base.julia_exename())
@@ -29,37 +25,25 @@ function runtests()
2925

3026
extra_args = []
3127
@static if !Sys.iswindows()
32-
if occursin( "OpenRTE", read(`mpiexec --version`, String))
28+
if occursin( "OpenRTE", read(`mpiexec --version`, String))
3329
push!(extra_args,"--oversubscribe")
3430
end
3531
end
3632

3733
nfail = 0
3834
printstyled("Running MPI.jl tests\n"; color=:white)
3935
for f in testfiles
40-
if f excludedfiles
41-
println("Skipping disabled test $f")
42-
continue
36+
coverage_opt = coverage_opts[Base.JLOptions().code_coverage]
37+
if f singlefiles
38+
run(`mpiexec $extra_args -n 1 $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
39+
elseif f juliafiles
40+
run(`$exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
41+
else
42+
run(`mpiexec $extra_args -n $nprocs $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
43+
end
44+
Base.with_output_color(:green,stdout) do io
45+
println(io,"\tSUCCESS: $f")
4346
end
44-
# try
45-
coverage_opt = coverage_opts[Base.JLOptions().code_coverage]
46-
if f singlefiles
47-
run(`mpiexec $extra_args -n 1 $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
48-
elseif f juliafiles
49-
run(`$exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
50-
else
51-
run(`mpiexec $extra_args -n $nprocs $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
52-
end
53-
Base.with_output_color(:green,stdout) do io
54-
println(io,"\tSUCCESS: $f")
55-
end
56-
# catch ex
57-
# Base.with_output_color(:red,stderr) do io
58-
# println(io,"\tError: $(joinpath(testdir, f))")
59-
# showerror(io,ex,backtrace())
60-
# end
61-
# nfail += 1
62-
# end
6347
end
6448
return nfail
6549
end

0 commit comments

Comments
 (0)