Skip to content

Commit a4139bb

Browse files
test: wrap testsets into one testset
This is to ensure all testsets run even if one fails as they are independent
1 parent ae9ce1b commit a4139bb

File tree

1 file changed

+30
-24
lines changed

1 file changed

+30
-24
lines changed

test/runtests.jl

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,34 @@ function dev_subpkg(subpkg)
88
subpkg_path = joinpath(dirname(@__DIR__), "lib", subpkg)
99
Pkg.develop(PackageSpec(path = subpkg_path))
1010
end
11-
for pkg in [
12-
"SurrogatesAbstractGPs", "SurrogatesFlux",
13-
"SurrogatesPolyChaos", "SurrogatesMOE",
14-
"SurrogatesRandomForest", "SurrogatesSVM"]
15-
@time begin
16-
dev_subpkg(pkg)
17-
Pkg.test(pkg)
18-
end
19-
end
2011

21-
@time @safetestset "GEKPLS.jl" begin include("GEKPLS.jl") end
22-
@time @safetestset "Radials.jl" begin include("Radials.jl") end
23-
@time @safetestset "Kriging.jl" begin include("Kriging.jl") end
24-
@time @safetestset "Sampling" begin include("sampling.jl") end
25-
@time @safetestset "Optimization" begin include("optimization.jl") end
26-
@time @safetestset "LinearSurrogate" begin include("linearSurrogate.jl") end
27-
@time @safetestset "Lobachevsky" begin include("lobachevsky.jl") end
28-
@time @safetestset "InverseDistanceSurrogate" begin include("inverseDistanceSurrogate.jl") end
29-
@time @safetestset "SecondOrderPolynomialSurrogate" begin include("secondOrderPolynomialSurrogate.jl") end
30-
# @time @safetestset "AD_Compatibility" begin include("AD_compatibility.jl") end
31-
@time @safetestset "Wendland" begin include("Wendland.jl") end
32-
@time @safetestset "VariableFidelity" begin include("VariableFidelity.jl") end
33-
@time @safetestset "Earth" begin include("earth.jl") end
34-
@time @safetestset "Gradient Enhanced Kriging" begin include("GEK.jl") end
35-
@time @safetestset "Section Samplers" begin include("SectionSampleTests.jl") end
12+
@testset "Surrogates" begin
13+
@testset "Libs" begin
14+
@testset "$pkg" for pkg in [
15+
"SurrogatesAbstractGPs", "SurrogatesFlux",
16+
"SurrogatesPolyChaos", "SurrogatesMOE",
17+
"SurrogatesRandomForest", "SurrogatesSVM"]
18+
@time begin
19+
dev_subpkg(pkg)
20+
Pkg.test(pkg)
21+
end
22+
end
23+
end
24+
@testset "Algorithms" begin
25+
@time @safetestset "GEKPLS" begin include("GEKPLS.jl") end
26+
@time @safetestset "Radials" begin include("Radials.jl") end
27+
@time @safetestset "Kriging" begin include("Kriging.jl") end
28+
@time @safetestset "Sampling" begin include("sampling.jl") end
29+
@time @safetestset "Optimization" begin include("optimization.jl") end
30+
@time @safetestset "LinearSurrogate" begin include("linearSurrogate.jl") end
31+
@time @safetestset "Lobachevsky" begin include("lobachevsky.jl") end
32+
@time @safetestset "InverseDistanceSurrogate" begin include("inverseDistanceSurrogate.jl") end
33+
@time @safetestset "SecondOrderPolynomialSurrogate" begin include("secondOrderPolynomialSurrogate.jl") end
34+
# @time @safetestset "AD_Compatibility" begin include("AD_compatibility.jl") end
35+
@time @safetestset "Wendland" begin include("Wendland.jl") end
36+
@time @safetestset "VariableFidelity" begin include("VariableFidelity.jl") end
37+
@time @safetestset "Earth" begin include("earth.jl") end
38+
@time @safetestset "Gradient Enhanced Kriging" begin include("GEK.jl") end
39+
@time @safetestset "Section Samplers" begin include("SectionSampleTests.jl") end
40+
end
41+
end

0 commit comments

Comments
 (0)