Skip to content

fix and test on Julia v1.12 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2025
Merged

fix and test on Julia v1.12 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ jobs:
- version: '1.11'
os: ubuntu-latest
arch: x64
- version: '1.12'
os: ubuntu-latest
arch: x64
steps:
- name: Check out project
uses: actions/checkout@v5
Expand Down
4 changes: 2 additions & 2 deletions src/macros.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ macro test_trixi_include_base(elixir, args...)

# if present, compare l2 and linf errors against reference values
if !isnothing($l2) || !isnothing($linf)
l2_measured, linf_measured = invokelatest((@__MODULE__).analysis_callback,
(@__MODULE__).sol)
mod = @__MODULE__
l2_measured, linf_measured = @invokelatest mod.analysis_callback(@invokelatest mod.sol)

if mpi_isroot() && !isnothing($l2)
@test length($l2) == length(l2_measured)
Expand Down
100 changes: 80 additions & 20 deletions test/test_test_trixi_include.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,45 @@ end

# just include
@test_trixi_include_base(path)
@test @isdefined x
@test x == 4
if VERSION >= v"1.12"
mod = @__MODULE__
@test @invokelatest isdefined(mod, :x)
@test (@invokelatest mod.x) == 4
else
@test @isdefined x
@test x == 4
end

@test_trixi_include(path)
@test @isdefined x
@test x == 4
if VERSION >= v"1.12"
mod = @__MODULE__
@test @invokelatest isdefined(mod, :x)
@test (@invokelatest mod.x) == 4
else
@test @isdefined x
@test x == 4
end

# include and overwrite included variable by a constant
@test_trixi_include_base(path, x=9)
@test @isdefined x
@test x == 9
if VERSION >= v"1.12"
mod = @__MODULE__
@test @invokelatest isdefined(mod, :x)
@test (@invokelatest mod.x) == 9
else
@test @isdefined x
@test x == 9
end

@test_trixi_include(path, x=9)
@test @isdefined x
@test x == 9
if VERSION >= v"1.12"
mod = @__MODULE__
@test @invokelatest isdefined(mod, :x)
@test (@invokelatest mod.x) == 9
else
@test @isdefined x
@test x == 9
end
end
end

Expand All @@ -51,30 +75,66 @@ end
# overwrite included variable by a (global) variable
global override = 5
@test_trixi_include_base(path, x=override)
@test @isdefined x
@test x == 5
if VERSION >= v"1.12"
mod = @__MODULE__
@test @invokelatest isdefined(mod, :x)
@test (@invokelatest mod.x) == 5
else
@test @isdefined x
@test x == 5
end

@test_trixi_include(path, x=override)
@test @isdefined x
@test x == 5
if VERSION >= v"1.12"
mod = @__MODULE__
@test @invokelatest isdefined(mod, :x)
@test (@invokelatest mod.x) == 5
else
@test @isdefined x
@test x == 5
end

# overwrite included variable by another included variables
@test_trixi_include_base(path, x=seed)
@test @isdefined x
@test x == 42
if VERSION >= v"1.12"
mod = @__MODULE__
@test @invokelatest isdefined(mod, :x)
@test (@invokelatest mod.x) == 42
else
@test @isdefined x
@test x == 42
end

@test_trixi_include(path, x=seed)
@test @isdefined x
@test x == 42
if VERSION >= v"1.12"
mod = @__MODULE__
@test @invokelatest isdefined(mod, :x)
@test (@invokelatest mod.x) == 42
else
@test @isdefined x
@test x == 42
end

# overwrite included variable by supplied variable
@test_trixi_include_base(path, seed=6, x=seed)
@test @isdefined x
@test x == 6
if VERSION >= v"1.12"
mod = @__MODULE__
@test @invokelatest isdefined(mod, :x)
@test (@invokelatest mod.x) == 6
else
@test @isdefined x
@test x == 6
end

@test_trixi_include(path, seed=6, x=seed)
@test @isdefined x
@test x == 6
if VERSION >= v"1.12"
mod = @__MODULE__
@test @invokelatest isdefined(mod, :x)
@test (@invokelatest mod.x) == 6
else
@test @isdefined x
@test x == 6
end
end
end

Expand Down