Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ OrdinaryDiffEq = "7"
ParserCombinator = "2"
Pkg = "1"
PythonCall = "0.9.29"
SafeTestsets = "0.1"
SafeTestsets = "0.1, 1"
SciMLTesting = "1"
Test = "1.10"
julia = "1.10"

Expand All @@ -32,7 +33,8 @@ Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Aqua", "Pkg", "SafeTestsets", "OrdinaryDiffEq", "Test"]
test = ["Aqua", "Pkg", "SafeTestsets", "SciMLTesting", "OrdinaryDiffEq", "Test"]
7 changes: 7 additions & 0 deletions test/nopre/Project.toml → test/NoPre/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
BaseModelica = "a17d5099-185d-4ff5-b5d3-51aa4569e56d"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[sources]
BaseModelica = {path = "../.."}

[compat]
Aqua = "0.8"
JET = "0.9, 0.11.2"
SafeTestsets = "0.1, 1"
SciMLTesting = "1"
julia = "1.10"
File renamed without changes.
File renamed without changes.
50 changes: 26 additions & 24 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
using Pkg, Test, SafeTestsets
using Pkg
using SafeTestsets
using SciMLTesting

const GROUP = get(ENV, "GROUP", "All")

if (GROUP == "NoPre" || GROUP == "Quality") && isempty(VERSION.prerelease)
Pkg.activate(joinpath(@__DIR__, "nopre"))
# The NoPre group runs Aqua/JET in the test/NoPre sub-env, but only on a non-prerelease
# Julia: those tools produce spurious reports on prerelease builds, so the whole group
# (env activation included) is a no-op on a `pre` matrix entry. A folder-discovery body
# cannot express this guard, so NoPre stays an explicit thunk. "Quality" is a legacy
# alias for NoPre.
function nopre_group()
isempty(VERSION.prerelease) || return nothing
Pkg.activate(joinpath(@__DIR__, "NoPre"))
Pkg.develop(PackageSpec(path = dirname(@__DIR__)))
Pkg.instantiate()
@testset "Quality Assurance" begin
@safetestset "Quality Assurance" include("qa.jl")
@safetestset "JET Static Analysis" include("test_jet.jl")
end
@safetestset "Quality Assurance" include(joinpath(@__DIR__, "NoPre", "qa.jl"))
@safetestset "JET Static Analysis" include(joinpath(@__DIR__, "NoPre", "test_jet.jl"))
return nothing
end

if GROUP == "All" || GROUP == "Core"
@testset "BaseModelica" begin
@safetestset "Julia Parser Tests" begin
include("test_julia_parser.jl")
end

@safetestset "ANTLR Parser Tests" begin
include("test_antlr_parser.jl")
end

@safetestset "Error Message Tests" begin
include("test_error_messages.jl")
end
end
end
run_tests(;
core = function ()
@safetestset "Julia Parser Tests" include("test_julia_parser.jl")
@safetestset "ANTLR Parser Tests" include("test_antlr_parser.jl")
return @safetestset "Error Message Tests" include("test_error_messages.jl")
end,
groups = Dict("NoPre" => nopre_group),
umbrellas = Dict("Quality" => ["NoPre"]),
# Original runtests ran NoPre/Quality only for those explicit GROUPs, never under
# "All"; curate "All" to Core only to preserve that.
all = ["Core"],
)
Loading