Skip to content

Commit 7379cd7

Browse files
Honor generic downstream test groups
Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com>
1 parent 8037f9f commit 7379cd7

6 files changed

Lines changed: 32 additions & 5 deletions

File tree

lib/DelayDiffEq/test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using SafeTestsets
22

3-
const TEST_GROUP = get(ENV, "ODEDIFFEQ_TEST_GROUP", "ALL")
3+
const TEST_GROUP = get(ENV, "ODEDIFFEQ_TEST_GROUP", get(ENV, "GROUP", "ALL"))
44

55
if TEST_GROUP == "ALL" || TEST_GROUP == "Interface"
66
@time @safetestset "AD Tests" begin

lib/DiffEqBase/test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ using Pkg
22
using SafeTestsets
33
using Test
44

5-
const TEST_GROUP = get(ENV, "ODEDIFFEQ_TEST_GROUP", "Core")
5+
const TEST_GROUP = get(ENV, "ODEDIFFEQ_TEST_GROUP", get(ENV, "GROUP", "Core"))
66

77
function activate_downstream_env()
88
Pkg.activate(joinpath(@__DIR__, "downstream"))

lib/DiffEqDevTools/test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ using DiffEqDevTools
22
using SciMLTesting
33
using Test
44

5-
const TEST_GROUP = get(ENV, "ODEDIFFEQ_TEST_GROUP", "ALL")
5+
const TEST_GROUP = get(ENV, "ODEDIFFEQ_TEST_GROUP", get(ENV, "GROUP", "ALL"))
66

77
function activate_qa_env()
88
return activate_group_env(joinpath(@__DIR__, "qa"); parent = [dirname(@__DIR__), joinpath(@__DIR__, "..", "..", "..")])

lib/StochasticDiffEq/test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ end
1515

1616
const LONGER_TESTS = false
1717

18-
const TEST_GROUP = get(ENV, "ODEDIFFEQ_TEST_GROUP", "ALL")
18+
const TEST_GROUP = get(ENV, "ODEDIFFEQ_TEST_GROUP", get(ENV, "GROUP", "ALL"))
1919

2020
const is_APPVEYOR = Sys.iswindows() && haskey(ENV, "APPVEYOR")
2121

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using Test
2+
3+
@testset "Sublibrary group environment precedence" begin
4+
runners = Dict(
5+
joinpath(@__DIR__, "..", "..", "lib", "DiffEqBase", "test", "runtests.jl") => "Core",
6+
joinpath(@__DIR__, "..", "..", "lib", "DiffEqDevTools", "test", "runtests.jl") => "ALL",
7+
joinpath(@__DIR__, "..", "..", "lib", "DelayDiffEq", "test", "runtests.jl") => "ALL",
8+
joinpath(@__DIR__, "..", "..", "lib", "StochasticDiffEq", "test", "runtests.jl") => "ALL",
9+
)
10+
11+
for (runner, default) in runners
12+
assignment = match(r"const TEST_GROUP = ([^\n]+)", read(runner, String))
13+
@test assignment !== nothing
14+
selector = Meta.parse(only(assignment.captures))
15+
16+
withenv("ODEDIFFEQ_TEST_GROUP" => nothing, "GROUP" => "Requested") do
17+
@test Core.eval(@__MODULE__, selector) == "Requested"
18+
end
19+
withenv("ODEDIFFEQ_TEST_GROUP" => "Specific", "GROUP" => "Requested") do
20+
@test Core.eval(@__MODULE__, selector) == "Specific"
21+
end
22+
withenv("ODEDIFFEQ_TEST_GROUP" => nothing, "GROUP" => nothing) do
23+
@test Core.eval(@__MODULE__, selector) == default
24+
end
25+
end
26+
end

test/runtests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ end
190190

191191
function qa_group()
192192
is_APPVEYOR && return
193-
return @time @safetestset "Quality Assurance Tests" include("qa/qa_tests.jl")
193+
@time @safetestset "Quality Assurance Tests" include("qa/qa_tests.jl")
194+
return @time @safetestset "Sublibrary Group Selection" include("qa/sublibrary_group_selection.jl")
194195
end
195196

196197
function activate_gpu_env()

0 commit comments

Comments
 (0)