Skip to content

Commit 743113c

Browse files
committed
Update runtests.jl
1 parent 910f69a commit 743113c

File tree

1 file changed

+2
-37
lines changed

1 file changed

+2
-37
lines changed

test/runtests.jl

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,12 @@ using Distributed: workers, nworkers
99
using Distributed: procs, nprocs
1010
using Distributed: remotecall_fetch, @spawnat
1111
using Test: @testset, @test, @test_skip
12-
# ElasticManager:
13-
using HTCondorClusterManager: ElasticManager
14-
# Slurm:
15-
using HTCondorClusterManager: addprocs_slurm, SlurmManager
16-
# SGE:
17-
using HTCondorClusterManager: addprocs_sge, SGEManager
18-
19-
const test_args = lowercase.(strip.(ARGS))
20-
21-
@info "" test_args
2212

23-
slurm_is_installed() = !isnothing(Sys.which("sbatch"))
24-
qsub_is_installed() = !isnothing(Sys.which("qsub"))
13+
using HTCondorClusterManager: addprocs_sge, SGEManager
2514

2615
@testset "HTCondorClusterManager.jl" begin
2716
include("elastic.jl")
2817

29-
if slurm_is_installed()
30-
@info "Running the Slurm tests..." Sys.which("sbatch")
31-
include("slurm.jl")
32-
else
33-
if "slurm" in test_args
34-
@error "ERROR: The Slurm tests were explicitly requested in ARGS, but sbatch was not found, so the Slurm tests cannot be run" Sys.which("sbatch") test_args
35-
@test false
36-
else
37-
@warn "sbatch was not found - Slurm tests will be skipped" Sys.which("sbatch")
38-
@test_skip false
39-
end
40-
end
41-
42-
if qsub_is_installed()
43-
@info "Running the SGE (via qsub) tests..." Sys.which("qsub")
44-
include("sge_qsub.jl")
45-
else
46-
if "sge_qsub" in test_args
47-
@error "ERROR: The SGE tests were explicitly requested in ARGS, but qsub was not found, so the SGE tests cannot be run" Sys.which("qsub") test_args
48-
@test false
49-
else
50-
@warn "qsub was not found - SGE tests will be skipped" Sys.which("qsub")
51-
@test_skip false
52-
end
53-
end
18+
include("condor.jl")
5419

5520
end # @testset

0 commit comments

Comments
 (0)