Skip to content

Commit 2bf3401

Browse files
Merge pull request #3038 from SciML/fixmaster
Fix test setup
2 parents 690a659 + 46cfdc5 commit 2bf3401

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

.github/workflows/Tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
group:
2929
- InterfaceI
3030
- InterfaceII
31+
- SymbolicIndexingInterface
32+
- Extended
3133
- Extensions
3234
- Downstream
3335
- RegressionI

test/runtests.jl

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,57 +32,62 @@ end
3232
@safetestset "Dynamic Quantities Test" include("dq_units.jl")
3333
@safetestset "Unitful Quantities Test" include("units.jl")
3434
@safetestset "Mass Matrix Test" include("mass_matrix.jl")
35-
@safetestset "SteadyStateSystem Test" include("steadystatesystems.jl")
36-
@safetestset "SDESystem Test" include("sdesystem.jl")
37-
@safetestset "DDESystem Test" include("dde.jl")
38-
@safetestset "NonlinearSystem Test" include("nonlinearsystem.jl")
3935
@safetestset "InitializationSystem Test" include("initializationsystem.jl")
4036
@safetestset "Guess Propagation" include("guess_propagation.jl")
4137
@safetestset "Hierarchical Initialization Equations" include("hierarchical_initialization_eqs.jl")
42-
@safetestset "PDE Construction Test" include("pde.jl")
43-
@safetestset "JumpSystem Test" include("jumpsystem.jl")
44-
@safetestset "Constraints Test" include("constraints.jl")
4538
@safetestset "Reduction Test" include("reduction.jl")
4639
@safetestset "Split Parameters Test" include("split_parameters.jl")
4740
@safetestset "StaticArrays Test" include("static_arrays.jl")
4841
@safetestset "Components Test" include("components.jl")
4942
@safetestset "Model Parsing Test" include("model_parsing.jl")
50-
@safetestset "print_tree" include("print_tree.jl")
5143
@safetestset "Error Handling" include("error_handling.jl")
5244
@safetestset "StructuralTransformations" include("structural_transformation/runtests.jl")
5345
@safetestset "State Selection Test" include("state_selection.jl")
5446
@safetestset "Symbolic Event Test" include("symbolic_events.jl")
5547
@safetestset "Stream Connect Test" include("stream_connectors.jl")
5648
@safetestset "Domain Connect Test" include("domain_connectors.jl")
5749
@safetestset "Lowering Integration Test" include("lowering_solving.jl")
58-
@safetestset "Test Big System Usage" include("bigsystem.jl")
5950
@safetestset "Dependency Graph Test" include("dep_graphs.jl")
6051
@safetestset "Function Registration Test" include("function_registration.jl")
6152
@safetestset "Precompiled Modules Test" include("precompile_test.jl")
62-
@safetestset "Variable Utils Test" include("variable_utils.jl")
63-
@safetestset "Variable Metadata Test" include("test_variable_metadata.jl")
6453
@safetestset "DAE Jacobians Test" include("dae_jacobian.jl")
6554
@safetestset "Jacobian Sparsity" include("jacobiansparsity.jl")
6655
@safetestset "Modelingtoolkitize Test" include("modelingtoolkitize.jl")
67-
@safetestset "OptimizationSystem Test" include("optimizationsystem.jl")
6856
@safetestset "FuncAffect Test" include("funcaffect.jl")
6957
@safetestset "Constants Test" include("constants.jl")
7058
@safetestset "Parameter Dependency Test" include("parameter_dependencies.jl")
7159
@safetestset "Generate Custom Function Test" include("generate_custom_function.jl")
7260
@safetestset "Initial Values Test" include("initial_values.jl")
73-
@safetestset "Discrete System" include("discrete_system.jl")
7461
@safetestset "Equation Type Accessors Test" include("equation_type_accessors.jl")
7562
@safetestset "Equations with complex values" include("complex.jl")
7663
end
7764
end
7865

79-
if GROUP == "All" || GROUP == "InterfaceI" || GROUP == "SymbolicIndexingInterface"
66+
if GROUP == "All" || GROUP == "InterfaceII"
67+
@testset "InterfaceII" begin
68+
@safetestset "Variable Utils Test" include("variable_utils.jl")
69+
@safetestset "Variable Metadata Test" include("test_variable_metadata.jl")
70+
@safetestset "OptimizationSystem Test" include("optimizationsystem.jl")
71+
@safetestset "Discrete System" include("discrete_system.jl")
72+
@safetestset "SteadyStateSystem Test" include("steadystatesystems.jl")
73+
@safetestset "SDESystem Test" include("sdesystem.jl")
74+
@safetestset "DDESystem Test" include("dde.jl")
75+
@safetestset "NonlinearSystem Test" include("nonlinearsystem.jl")
76+
@safetestset "PDE Construction Test" include("pde.jl")
77+
@safetestset "JumpSystem Test" include("jumpsystem.jl")
78+
@safetestset "print_tree" include("print_tree.jl")
79+
@safetestset "Constraints Test" include("constraints.jl")
80+
end
81+
end
82+
83+
if GROUP == "All" || GROUP == "SymbolicIndexingInterface"
8084
@safetestset "SymbolicIndexingInterface test" include("symbolic_indexing_interface.jl")
8185
@safetestset "SciML Problem Input Test" include("sciml_problem_inputs.jl")
8286
@safetestset "MTKParameters Test" include("mtkparameters.jl")
8387
end
8488

85-
if GROUP == "All" || GROUP == "InterfaceII"
89+
if GROUP == "All" || GROUP == "Extended"
90+
@safetestset "Test Big System Usage" include("bigsystem.jl")
8691
println("C compilation test requires gcc available in the path!")
8792
@safetestset "C Compilation Test" include("ccompile.jl")
8893
@testset "Distributed Test" include("distributed.jl")

0 commit comments

Comments
 (0)