Skip to content

Commit 0768580

Browse files
jishnubjishnub
authored
Load testhelpers into test modules instead of Main (#1376)
This avoids unnecessary namespace collisions in `Main`.
1 parent 0116878 commit 0768580

17 files changed

+111
-142
lines changed

‎test/adjtrans.jl

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ isdefined(Main, :pruned_old_LA) || @eval Main include("prune_old_LA.jl")
66

77
using Test, LinearAlgebra
88

9-
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
10-
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
9+
const TESTDIR = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
10+
const TESTHELPERS = joinpath(TESTDIR, "testhelpers", "testhelpers.jl")
11+
isdefined(Main, :LinearAlgebraTestHelpers) || Base.include(Main, TESTHELPERS)
1112

12-
isdefined(Main, :OffsetArrays) || @eval Main include(joinpath($TESTHELPERS, "OffsetArrays.jl"))
13-
using .Main.OffsetArrays
14-
15-
isdefined(Main, :ImmutableArrays) || @eval Main include(joinpath($TESTHELPERS, "ImmutableArrays.jl"))
16-
using .Main.ImmutableArrays
13+
using Main.LinearAlgebraTestHelpers.OffsetArrays
14+
using Main.LinearAlgebraTestHelpers.ImmutableArrays
1715

1816
@testset "Adjoint and Transpose inner constructor basics" begin
1917
intvec, intmat = [1, 2], [1 2; 3 4]

‎test/bidiag.jl

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,16 @@ isdefined(Main, :pruned_old_LA) || @eval Main include("prune_old_LA.jl")
77
using Test, LinearAlgebra, Random
88
using LinearAlgebra: BlasReal, BlasFloat
99

10-
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
11-
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
12-
13-
isdefined(Main, :Quaternions) || @eval Main include(joinpath($TESTHELPERS, "Quaternions.jl"))
14-
using .Main.Quaternions
15-
16-
isdefined(Main, :InfiniteArrays) || @eval Main include(joinpath($TESTHELPERS, "InfiniteArrays.jl"))
17-
using .Main.InfiniteArrays
18-
19-
isdefined(Main, :FillArrays) || @eval Main include(joinpath($TESTHELPERS, "FillArrays.jl"))
20-
using .Main.FillArrays
21-
22-
isdefined(Main, :OffsetArrays) || @eval Main include(joinpath($TESTHELPERS, "OffsetArrays.jl"))
23-
using .Main.OffsetArrays
24-
25-
isdefined(Main, :SizedArrays) || @eval Main include(joinpath($TESTHELPERS, "SizedArrays.jl"))
26-
using .Main.SizedArrays
27-
28-
isdefined(Main, :ImmutableArrays) || @eval Main include(joinpath($TESTHELPERS, "ImmutableArrays.jl"))
29-
using .Main.ImmutableArrays
10+
const TESTDIR = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
11+
const TESTHELPERS = joinpath(TESTDIR, "testhelpers", "testhelpers.jl")
12+
isdefined(Main, :LinearAlgebraTestHelpers) || Base.include(Main, TESTHELPERS)
13+
14+
using Main.LinearAlgebraTestHelpers.Quaternions
15+
using Main.LinearAlgebraTestHelpers.InfiniteArrays
16+
using Main.LinearAlgebraTestHelpers.FillArrays
17+
using Main.LinearAlgebraTestHelpers.OffsetArrays
18+
using Main.LinearAlgebraTestHelpers.SizedArrays
19+
using Main.LinearAlgebraTestHelpers.ImmutableArrays
3020

3121
include("testutils.jl") # test_approx_eq_modphase
3222

‎test/cholesky.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ using Test, LinearAlgebra, Random
88
using LinearAlgebra: BlasComplex, BlasFloat, BlasReal, QRPivoted,
99
PosDefException, RankDeficientException, chkfullrank
1010

11-
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
12-
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
11+
const TESTDIR = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
12+
const TESTHELPERS = joinpath(TESTDIR, "testhelpers", "testhelpers.jl")
13+
isdefined(Main, :LinearAlgebraTestHelpers) || Base.include(Main, TESTHELPERS)
1314

14-
isdefined(Main, :Quaternions) || @eval Main include(joinpath($TESTHELPERS, "Quaternions.jl"))
15-
using .Main.Quaternions
15+
using Main.LinearAlgebraTestHelpers.Quaternions
1616

1717
function unary_ops_tests(a, ca, tol; n=size(a, 1))
1818
@test inv(ca)*a ≈ Matrix(I, n, n)

‎test/dense.jl

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ using Test, LinearAlgebra, Random
88
using LinearAlgebra: BlasComplex, BlasFloat, BlasReal
99
using Test: GenericArray
1010

11-
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
12-
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
11+
const TESTDIR = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
12+
const TESTHELPERS = joinpath(TESTDIR, "testhelpers", "testhelpers.jl")
13+
isdefined(Main, :LinearAlgebraTestHelpers) || Base.include(Main, TESTHELPERS)
1314

14-
isdefined(Main, :FillArrays) || @eval Main include(joinpath($TESTHELPERS, "FillArrays.jl"))
15-
import Main.FillArrays
16-
17-
isdefined(Main, :SizedArrays) || @eval Main include(joinpath($TESTHELPERS, "SizedArrays.jl"))
18-
using Main.SizedArrays
15+
import Main.LinearAlgebraTestHelpers.FillArrays
16+
using Main.LinearAlgebraTestHelpers.SizedArrays
1917

2018
@testset "Check that non-floats are correctly promoted" begin
2119
@test [1 0 0; 0 1 0]\[1,1] ≈ [1;1;0]

‎test/diagonal.jl

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,15 @@ isdefined(Main, :pruned_old_LA) || @eval Main include("prune_old_LA.jl")
77
using Test, LinearAlgebra, Random
88
using LinearAlgebra: BlasFloat, BlasComplex
99

10-
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
11-
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
12-
13-
isdefined(Main, :OffsetArrays) || @eval Main include(joinpath($TESTHELPERS, "OffsetArrays.jl"))
14-
using .Main.OffsetArrays
15-
16-
isdefined(Main, :InfiniteArrays) || @eval Main include(joinpath($TESTHELPERS, "InfiniteArrays.jl"))
17-
using .Main.InfiniteArrays
18-
19-
isdefined(Main, :FillArrays) || @eval Main include(joinpath($TESTHELPERS, "FillArrays.jl"))
20-
using .Main.FillArrays
21-
22-
isdefined(Main, :SizedArrays) || @eval Main include(joinpath($TESTHELPERS, "SizedArrays.jl"))
23-
using .Main.SizedArrays
24-
25-
isdefined(Main, :ImmutableArrays) || @eval Main include(joinpath($TESTHELPERS, "ImmutableArrays.jl"))
26-
using .Main.ImmutableArrays
10+
const TESTDIR = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
11+
const TESTHELPERS = joinpath(TESTDIR, "testhelpers", "testhelpers.jl")
12+
isdefined(Main, :LinearAlgebraTestHelpers) || Base.include(Main, TESTHELPERS)
13+
14+
using Main.LinearAlgebraTestHelpers.OffsetArrays
15+
using Main.LinearAlgebraTestHelpers.InfiniteArrays
16+
using Main.LinearAlgebraTestHelpers.FillArrays
17+
using Main.LinearAlgebraTestHelpers.SizedArrays
18+
using Main.LinearAlgebraTestHelpers.ImmutableArrays
2719

2820
const n=12 # Size of matrix problem to test
2921
Random.seed!(1)

‎test/generic.jl

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,15 @@ using Test, LinearAlgebra, Random
88
using Test: GenericArray
99
using LinearAlgebra: isbanded
1010

11-
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
12-
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
13-
14-
isdefined(Main, :Quaternions) || @eval Main include(joinpath($TESTHELPERS, "Quaternions.jl"))
15-
using .Main.Quaternions
16-
17-
isdefined(Main, :OffsetArrays) || @eval Main include(joinpath($TESTHELPERS, "OffsetArrays.jl"))
18-
using .Main.OffsetArrays
19-
20-
isdefined(Main, :DualNumbers) || @eval Main include(joinpath($TESTHELPERS, "DualNumbers.jl"))
21-
using .Main.DualNumbers
22-
23-
isdefined(Main, :FillArrays) || @eval Main include(joinpath($TESTHELPERS, "FillArrays.jl"))
24-
using .Main.FillArrays
25-
26-
isdefined(Main, :SizedArrays) || @eval Main include(joinpath($TESTHELPERS, "SizedArrays.jl"))
27-
using .Main.SizedArrays
11+
const TESTDIR = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
12+
const TESTHELPERS = joinpath(TESTDIR, "testhelpers", "testhelpers.jl")
13+
isdefined(Main, :LinearAlgebraTestHelpers) || Base.include(Main, TESTHELPERS)
14+
15+
using Main.LinearAlgebraTestHelpers.Quaternions
16+
using Main.LinearAlgebraTestHelpers.OffsetArrays
17+
using Main.LinearAlgebraTestHelpers.DualNumbers
18+
using Main.LinearAlgebraTestHelpers.FillArrays
19+
using Main.LinearAlgebraTestHelpers.SizedArrays
2820

2921
Random.seed!(123)
3022

‎test/hessenberg.jl

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ isdefined(Main, :pruned_old_LA) || @eval Main include("prune_old_LA.jl")
66

77
using Test, LinearAlgebra, Random
88

9-
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
10-
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
9+
const TESTDIR = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
10+
const TESTHELPERS = joinpath(TESTDIR, "testhelpers", "testhelpers.jl")
11+
isdefined(Main, :LinearAlgebraTestHelpers) || Base.include(Main, TESTHELPERS)
1112

12-
isdefined(Main, :SizedArrays) || @eval Main include(joinpath($TESTHELPERS, "SizedArrays.jl"))
13-
using .Main.SizedArrays
14-
15-
isdefined(Main, :ImmutableArrays) || @eval Main include(joinpath($TESTHELPERS, "ImmutableArrays.jl"))
16-
using .Main.ImmutableArrays
13+
using Main.LinearAlgebraTestHelpers.SizedArrays
14+
using Main.LinearAlgebraTestHelpers.ImmutableArrays
1715

1816
# for tuple tests below
1917
≅(x,y) = all(p -> p[1] ≈ p[2], zip(x,y))

‎test/matmul.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ using Base: rtoldefault
88
using Test, LinearAlgebra, Random
99
using LinearAlgebra: mul!, Symmetric, Hermitian
1010

11-
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
12-
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
11+
const TESTDIR = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
12+
const TESTHELPERS = joinpath(TESTDIR, "testhelpers", "testhelpers.jl")
13+
isdefined(Main, :LinearAlgebraTestHelpers) || Base.include(Main, TESTHELPERS)
1314

14-
isdefined(Main, :SizedArrays) || @eval Main include(joinpath($TESTHELPERS, "SizedArrays.jl"))
15-
using .Main.SizedArrays
15+
using Main.LinearAlgebraTestHelpers.SizedArrays
1616

1717
## Test Julia fallbacks to BLAS routines
1818

‎test/runtests.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ include("prune_old_LA.jl")
44

55
using Test, LinearAlgebra
66

7+
const TESTDIR = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
8+
const TESTHELPERS = joinpath(TESTDIR, "testhelpers", "testhelpers.jl")
9+
isdefined(Main, :LinearAlgebraTestHelpers) || Base.include(Main, TESTHELPERS)
10+
711
for file in readlines(joinpath(@__DIR__, "testgroups"))
812
@info "Testing $file"
913
include(file * ".jl")

‎test/special.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ isdefined(Main, :pruned_old_LA) || @eval Main include("prune_old_LA.jl")
77
using Test, LinearAlgebra, Random
88
using LinearAlgebra: rmul!, BandIndex
99

10-
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
11-
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
10+
const TESTDIR = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
11+
const TESTHELPERS = joinpath(TESTDIR, "testhelpers", "testhelpers.jl")
12+
isdefined(Main, :LinearAlgebraTestHelpers) || Base.include(Main, TESTHELPERS)
1213

13-
isdefined(Main, :SizedArrays) || @eval Main include(joinpath($TESTHELPERS, "SizedArrays.jl"))
14-
using .Main.SizedArrays
14+
using Main.LinearAlgebraTestHelpers.SizedArrays
1515

1616
n= 10 #Size of matrix to test
1717
Random.seed!(1)

0 commit comments

Comments
 (0)