From 7e96aba6ea337c5a5a4ba58fa11cde5d6fcaa18b Mon Sep 17 00:00:00 2001 From: Chris Foster Date: Thu, 19 Aug 2021 23:52:03 +1000 Subject: [PATCH] Ensure only.(d) test is run without --bounds-check --- test/auto_boundscheck.jl | 21 +++++++++++++++++++++ test/broadcast.jl | 17 ----------------- test/runtests.jl | 5 +++++ 3 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 test/auto_boundscheck.jl diff --git a/test/auto_boundscheck.jl b/test/auto_boundscheck.jl new file mode 100644 index 0000000..1f0ef0b --- /dev/null +++ b/test/auto_boundscheck.jl @@ -0,0 +1,21 @@ +using Dictionaries +using Test + +# The following tests are run without the --bounds-check option. + +# Issue #63 - Broadcasting only omitted bounds check due to inbounds propagation +@static if VERSION < v"1.4" # Duplicate of Base implementation + Base.@propagate_inbounds function only(x) + i = iterate(x) + @boundscheck if i === nothing + throw(ArgumentError("Collection is empty, must contain exactly 1 element")) + end + (ret, state) = i + @boundscheck if iterate(x, state) !== nothing + throw(ArgumentError("Collection has multiple elements, must contain exactly 1 element")) + end + return ret + end +end +d3 = Dictionary([:a, :b], [[1,2], [3,4]]) +@test_throws ArgumentError only.(d3) diff --git a/test/broadcast.jl b/test/broadcast.jl index c49b991..dcbd0ca 100644 --- a/test/broadcast.jl +++ b/test/broadcast.jl @@ -28,21 +28,4 @@ @test isequal(d2, dictionary([1=>4, 2=>6, 3=>8, 4=>10, 5=>12])) @test_throws IndexError Dictionary([1,2],[1,2]) .+ Dictionary([2,3],[2,3]) - - # Issue #63 - Broadcasting only omitted bounds check due to inbounds propagation - if VERSION < v"1.4" # Compat - Base.@propagate_inbounds function only(x) - i = iterate(x) - @boundscheck if i === nothing - throw(ArgumentError("Collection is empty, must contain exactly 1 element")) - end - (ret, state) = i - @boundscheck if iterate(x, state) !== nothing - throw(ArgumentError("Collection has multiple elements, must contain exactly 1 element")) - end - return ret - end - end - d2 = Dictionary([:a, :b], [[1,2], [3,4]]) - @test_throws ArgumentError only.(d2) end diff --git a/test/runtests.jl b/test/runtests.jl index eabb6f7..6440cd0 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -16,3 +16,8 @@ include("filter.jl") include("find.jl") include("reverse.jl") include("show.jl") + +# Run the following test without julia --check-bounds=yes mode +cmd = deepcopy(Base.julia_cmd()) +filter!(a->!startswith(a, "--check-bounds="), cmd.exec) +@test process_exited(run(`$cmd auto_boundscheck.jl`))