Skip to content

Commit c93dedf

Browse files
authored
adjust tests for latest Julia master (#584)
* adjust tests for latest Julia master * 1.9-nightly to 1.10-night
1 parent 910cb6f commit c93dedf

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
version:
1616
- '1.6' # LTS
1717
- '1' # current stable
18-
- '1.9-nightly'
18+
- '1.10-nightly'
1919
- 'nightly'
2020
os:
2121
- ubuntu-latest

test/interpret.jl

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -770,15 +770,10 @@ end
770770
end
771771

772772
@testset "#476 isdefined QuoteNode" begin
773-
f() = !true
774-
775-
@generated function g()
776-
ci = @code_lowered f()
777-
ci.code[1] = Expr(:isdefined, QuoteNode(Float64))
778-
return ci
773+
@eval function issue476()
774+
return $(Expr(:isdefined, QuoteNode(Float64)))
779775
end
780-
781-
@test @interpret(g()) === true
776+
@test (true === @interpret issue476())
782777
end
783778

784779
const override_world = typemax(Csize_t) - 1
@@ -883,7 +878,11 @@ end
883878
end
884879

885880
ci = code_typed(foo, NTuple{2, Int}; optimize=false)[][1]
886-
mi = Core.Compiler.method_instances(foo, NTuple{2, Int})[]
881+
@static if VERSION v"1.10.0-DEV.873"
882+
mi = Core.Compiler.method_instances(foo, NTuple{2, Int}, Base.get_world_counter())[]
883+
else
884+
mi = Core.Compiler.method_instances(foo, NTuple{2, Int})[]
885+
end
887886

888887
frameargs = Any[foo, 1, 2]
889888
framecode = JuliaInterpreter.FrameCode(mi.def, ci)

test/limits.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ module EvalLimited end
8686
end
8787
modexs = collect(ExprSplitter(EvalLimited, ex))
8888
@static if isdefined(Core, :get_binding_type)
89-
nstmts = 10*12 + 20 # 10 * 12 statements per iteration + α
89+
nstmts = 10*15 + 20 # 10 * 15 statements per iteration + α
9090
else
9191
nstmts = 9*12 + 20 # 10 * 9 statements per iteration + α
9292
end

0 commit comments

Comments
 (0)