Skip to content

Commit 12ea8f8

Browse files
Fix testing setup
1 parent 22d488c commit 12ea8f8

File tree

3 files changed

+67
-60
lines changed

3 files changed

+67
-60
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jobs:
1616
strategy:
1717
matrix:
1818
group:
19-
- All
19+
- QA
20+
- Core
2021
version:
2122
- '1'
2223
steps:

test/qa.jl renamed to test/aqua.jl

File renamed without changes.

test/runtests.jl

Lines changed: 65 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,75 @@
11
using SafeTestsets
22

3-
@safetestset "Quality Assurance" begin
4-
include("qa.jl")
5-
end
3+
@time begin
4+
if GROUP == "QA" || GROUP == "All"
5+
@time @safetestset "Aqua" begin
6+
include("aqua.jl")
7+
end
8+
end
69

7-
# Blocks
8-
@safetestset "Blocks: utils" begin
9-
include("Blocks/utils.jl")
10-
end
11-
@safetestset "Blocks: math" begin
12-
include("Blocks/math.jl")
13-
end
14-
@safetestset "Blocks: nonlinear" begin
15-
include("Blocks/nonlinear.jl")
16-
end
17-
@safetestset "Blocks: continuous" begin
18-
include("Blocks/continuous.jl")
19-
end
20-
@safetestset "Blocks: sources" begin
21-
include("Blocks/sources.jl")
22-
end
23-
@safetestset "Blocks: analysis points" begin
24-
include("Blocks/test_analysis_points.jl")
25-
end
10+
if GROUP == "Core" || GROUP == "All"
11+
# Blocks
12+
@safetestset "Blocks: utils" begin
13+
include("Blocks/utils.jl")
14+
end
15+
@safetestset "Blocks: math" begin
16+
include("Blocks/math.jl")
17+
end
18+
@safetestset "Blocks: nonlinear" begin
19+
include("Blocks/nonlinear.jl")
20+
end
21+
@safetestset "Blocks: continuous" begin
22+
include("Blocks/continuous.jl")
23+
end
24+
@safetestset "Blocks: sources" begin
25+
include("Blocks/sources.jl")
26+
end
27+
@safetestset "Blocks: analysis points" begin
28+
include("Blocks/test_analysis_points.jl")
29+
end
2630

27-
# Electrical
28-
@safetestset "Analog Circuits" begin
29-
include("Electrical/analog.jl")
30-
end
31+
# Electrical
32+
@safetestset "Analog Circuits" begin
33+
include("Electrical/analog.jl")
34+
end
3135

32-
@safetestset "Digital Circuits" begin
33-
include("Electrical/digital.jl")
34-
end
35-
@safetestset "Chua Circuit Demo" begin
36-
include("chua_circuit.jl")
37-
end
36+
@safetestset "Digital Circuits" begin
37+
include("Electrical/digital.jl")
38+
end
39+
@safetestset "Chua Circuit Demo" begin
40+
include("chua_circuit.jl")
41+
end
3842

39-
# Thermal
40-
@safetestset "Thermal Circuits" begin
41-
include("Thermal/thermal.jl")
42-
end
43-
@safetestset "Thermal Demo" begin
44-
include("Thermal/demo.jl")
45-
end
43+
# Thermal
44+
@safetestset "Thermal Circuits" begin
45+
include("Thermal/thermal.jl")
46+
end
47+
@safetestset "Thermal Demo" begin
48+
include("Thermal/demo.jl")
49+
end
4650

47-
# Magnetic
48-
@safetestset "Magnetic" begin
49-
include("Magnetic/magnetic.jl")
50-
end
51+
# Magnetic
52+
@safetestset "Magnetic" begin
53+
include("Magnetic/magnetic.jl")
54+
end
5155

52-
# Mechanical
53-
@safetestset "Mechanical Rotation" begin
54-
include("Mechanical/rotational.jl")
55-
end
56-
@safetestset "Mechanical Translation" begin
57-
include("Mechanical/translational.jl")
58-
end
59-
@safetestset "Mechanical Translation" begin
60-
include("Mechanical/translational_modelica.jl")
61-
end
62-
@safetestset "Multi-Domain" begin
63-
include("multi_domain.jl")
64-
end
56+
# Mechanical
57+
@safetestset "Mechanical Rotation" begin
58+
include("Mechanical/rotational.jl")
59+
end
60+
@safetestset "Mechanical Translation" begin
61+
include("Mechanical/translational.jl")
62+
end
63+
@safetestset "Mechanical Translation" begin
64+
include("Mechanical/translational_modelica.jl")
65+
end
66+
@safetestset "Multi-Domain" begin
67+
include("multi_domain.jl")
68+
end
6569

66-
# Hydraulic
67-
@safetestset "Hydraulic IsothermalCompressible" begin
68-
include("Hydraulic/isothermal_compressible.jl")
70+
# Hydraulic
71+
@safetestset "Hydraulic IsothermalCompressible" begin
72+
include("Hydraulic/isothermal_compressible.jl")
73+
end
74+
end
6975
end

0 commit comments

Comments
 (0)