Skip to content

Commit 716d7f6

Browse files
fix test on nightly (#498)
Co-authored-by: Shuhei Kadowaki <aviatesk@gmail.com>
1 parent f365bcd commit 716d7f6

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

test/code_coverage/code_coverage.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ let
88
end
99
end
1010

11+
#using DiffUtils
12+
1113
@testset "code coverage" begin
1214
out = read(`$(Base.julia_cmd()) --startup=no --project=$(dirname(dirname(@__DIR__))) --code-coverage=user
1315
$(joinpath(@__DIR__(), "coverage_example.jl"))`, String)
@@ -23,5 +25,8 @@ end
2325
cov_data = replace(cov_data, "\r\n" => "\n")
2426
expected = replace(cov_data, "\r\n" => "\n")
2527
end
28+
#if cov_data != expected
29+
# DiffUtils.diff(cov_data, expected)
30+
#end
2631
@test cov_data == expected
2732
end

test/code_coverage/coverage_example.jl.cov

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
1 i % 3 == 0 && fizz()
88
1 i % 5 == 0 && buzz()
99
- else
10-
4 print(i, " ")
10+
3 print(i, " ")
1111
- end
12-
- end
12+
4 end
1313
1 return n
1414
- end
1515
-

test/interpret.jl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,14 @@ module VecTest
645645
end
646646
f() = 1.0 * one(Tensor{2,3})
647647
end
648-
let a = (VecElement{Float64}(1.0), VecElement{Float64}(2.0))
648+
let
649+
# NOTE we need to make sure this code block is compiled, since vecadd is generated function,
650+
# but currently `@interpret` doesn't handle a call to generated functions very well
651+
@static if isdefined(Base, :Experimental) &&
652+
isdefined(Base.Experimental, Symbol("@force_compile"))
653+
Base.Experimental.@force_compile
654+
end
655+
a = (VecElement{Float64}(1.0), VecElement{Float64}(2.0))
649656
@test @interpret(VecTest.vecadd(a, a)) == VecTest.vecadd(a, a)
650657
end
651658
@test @interpret(VecTest.f()) == [1 0 0; 0 1 0; 0 0 1]

test/limits.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ module EvalLimited end
9898
end
9999
@test 8 < EvalLimited.s < 50 # with Compiled(), 9 statements per iteration
100100
@test length(aborts) == 1
101-
@test aborts[1].at.line (2, 3, 4) # 2 corresponds to lowering of the for loop
101+
@test aborts[1].at.line (2, 3, 4, 5) # 2 corresponds to lowering of the for loop
102102

103103
# Now try again with recursive stack
104104
empty!(aborts)
@@ -117,8 +117,8 @@ module EvalLimited end
117117
@test length(aborts) == 1
118118
lin = aborts[1].at
119119
if lin.file == Symbol("fake.jl")
120-
@test lin.line (2, 3, 4)
120+
@test lin.line (2, 3, 4, 5)
121121
else
122-
@test lin.file == Symbol("range.jl") # if it aborts in `iterate`
122+
@test lin.method === :iterate || lin.method === :getproperty
123123
end
124124
end

0 commit comments

Comments
 (0)