From 2c6b38f66961dec628f9b76ba17d615c5ea9322d Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Tue, 25 Nov 2025 05:39:32 -0500 Subject: [PATCH 1/2] Separate out tests for the GPL build and do not run them when GPL libraries are not present. Fix #655 --- test/issues.jl | 4 ++-- test/runtests.jl | 17 +++++++++++++---- test/testgroups | 12 ------------ 3 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 test/testgroups diff --git a/test/issues.jl b/test/issues.jl index f198812a..6acd0a22 100644 --- a/test/issues.jl +++ b/test/issues.jl @@ -447,8 +447,8 @@ end C = copy(A) m1 = @which mul!(C,A,D,true,false) m2 = @which mul!(C,D,A,true,false) - @test m1.module == SparseArrays - @test m2.module == SparseArrays + @test_broken m1.module == SparseArrays + @test_broken m2.module == SparseArrays end @testset "issue #31453" for T in [UInt8, Int8, UInt16, Int16, UInt32, Int32] diff --git a/test/runtests.jl b/test/runtests.jl index c515e78d..5819db1a 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -7,13 +7,22 @@ if Base.get_bool_env("SPARSEARRAYS_AQUA_TEST", false) include("ambiguous.jl") end -for file in readlines(joinpath(@__DIR__, "testgroups")) - file == "" && continue # skip empty lines - include(file * ".jl") -end +include("allowscalar.jl") +include("fixed.jl") +include("higherorderfns.jl") +include("sparsematrix_constructors_indexing.jl") +include("sparsematrix_ops.jl") +include("sparsevector.jl") +include("issues.jl") if Base.USE_GPL_LIBS + include("cholmod.jl") + include("umfpack.jl") + include("spqr.jl") + include("linalg.jl") + include("linalg_solvers.jl") + nt = @static if isdefined(Threads, :maxthreadid) Threads.maxthreadid() else diff --git a/test/testgroups b/test/testgroups deleted file mode 100644 index a547762c..00000000 --- a/test/testgroups +++ /dev/null @@ -1,12 +0,0 @@ -allowscalar -cholmod -fixed -higherorderfns -issues -linalg -linalg_solvers -sparsematrix_constructors_indexing -sparsematrix_ops -sparsevector -spqr -umfpack From 229e458e47cb5d09bb973dc9752c9bd12f2489f2 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Tue, 25 Nov 2025 10:32:13 -0500 Subject: [PATCH 2/2] The broken tests work correctly with the latest nightly --- test/issues.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/issues.jl b/test/issues.jl index 6acd0a22..f198812a 100644 --- a/test/issues.jl +++ b/test/issues.jl @@ -447,8 +447,8 @@ end C = copy(A) m1 = @which mul!(C,A,D,true,false) m2 = @which mul!(C,D,A,true,false) - @test_broken m1.module == SparseArrays - @test_broken m2.module == SparseArrays + @test m1.module == SparseArrays + @test m2.module == SparseArrays end @testset "issue #31453" for T in [UInt8, Int8, UInt16, Int16, UInt32, Int32]