Skip to content

Commit ead3e8a

Browse files
jishnubjishnub
committed
Load testhelpers into test modules instead of Main 
1 parent b265fea commit ead3e8a

File tree

15 files changed

+80
-79
lines changed

15 files changed

+80
-79
lines changed

‎test/adjtrans.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ using Test, LinearAlgebra
99
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
1010
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
1111

12-
isdefined(Main, :OffsetArrays) || @eval Main include(joinpath($TESTHELPERS, "OffsetArrays.jl"))
12+
include(joinpath(TESTHELPERS, "OffsetArrays.jl"))
1313
using .Main.OffsetArrays
1414

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

1818
@testset "Adjoint and Transpose inner constructor basics" begin

‎test/bidiag.jl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ using LinearAlgebra: BlasReal, BlasFloat
1010
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
1111
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
1212

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

16-
isdefined(Main, :InfiniteArrays) || @eval Main include(joinpath($TESTHELPERS, "InfiniteArrays.jl"))
17-
using .Main.InfiniteArrays
16+
include(joinpath(TESTHELPERS, "InfiniteArrays.jl"))
17+
using .InfiniteArrays
1818

19-
isdefined(Main, :FillArrays) || @eval Main include(joinpath($TESTHELPERS, "FillArrays.jl"))
20-
using .Main.FillArrays
19+
include(joinpath(TESTHELPERS, "FillArrays.jl"))
20+
using .FillArrays
2121

22-
isdefined(Main, :OffsetArrays) || @eval Main include(joinpath($TESTHELPERS, "OffsetArrays.jl"))
23-
using .Main.OffsetArrays
22+
include(joinpath(TESTHELPERS, "OffsetArrays.jl"))
23+
using .OffsetArrays
2424

25-
isdefined(Main, :SizedArrays) || @eval Main include(joinpath($TESTHELPERS, "SizedArrays.jl"))
26-
using .Main.SizedArrays
25+
include(joinpath(TESTHELPERS, "SizedArrays.jl"))
26+
using .SizedArrays
2727

28-
isdefined(Main, :ImmutableArrays) || @eval Main include(joinpath($TESTHELPERS, "ImmutableArrays.jl"))
28+
include(joinpath(TESTHELPERS, "ImmutableArrays.jl"))
2929
using .Main.ImmutableArrays
3030

3131
include("testutils.jl") # test_approx_eq_modphase

‎test/cholesky.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ using LinearAlgebra: BlasComplex, BlasFloat, BlasReal, QRPivoted,
1111
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
1212
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
1313

14-
isdefined(Main, :Quaternions) || @eval Main include(joinpath($TESTHELPERS, "Quaternions.jl"))
15-
using .Main.Quaternions
14+
include(joinpath(TESTHELPERS, "Quaternions.jl"))
15+
using .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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ using Test: GenericArray
1111
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
1212
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
1313

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

17-
isdefined(Main, :SizedArrays) || @eval Main include(joinpath($TESTHELPERS, "SizedArrays.jl"))
18-
using Main.SizedArrays
17+
include(joinpath(TESTHELPERS, "SizedArrays.jl"))
18+
using .SizedArrays
1919

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

‎test/diagonal.jl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ using LinearAlgebra: BlasFloat, BlasComplex
1010
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
1111
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
1212

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

16-
isdefined(Main, :InfiniteArrays) || @eval Main include(joinpath($TESTHELPERS, "InfiniteArrays.jl"))
17-
using .Main.InfiniteArrays
16+
include(joinpath(TESTHELPERS, "InfiniteArrays.jl"))
17+
using .InfiniteArrays
1818

19-
isdefined(Main, :FillArrays) || @eval Main include(joinpath($TESTHELPERS, "FillArrays.jl"))
20-
using .Main.FillArrays
19+
include(joinpath(TESTHELPERS, "FillArrays.jl"))
20+
using .FillArrays
2121

22-
isdefined(Main, :SizedArrays) || @eval Main include(joinpath($TESTHELPERS, "SizedArrays.jl"))
23-
using .Main.SizedArrays
22+
include(joinpath(TESTHELPERS, "SizedArrays.jl"))
23+
using .SizedArrays
2424

25-
isdefined(Main, :ImmutableArrays) || @eval Main include(joinpath($TESTHELPERS, "ImmutableArrays.jl"))
26-
using .Main.ImmutableArrays
25+
include(joinpath(TESTHELPERS, "ImmutableArrays.jl"))
26+
using .ImmutableArrays
2727

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

‎test/generic.jl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ using LinearAlgebra: isbanded
1111
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
1212
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
1313

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

17-
isdefined(Main, :OffsetArrays) || @eval Main include(joinpath($TESTHELPERS, "OffsetArrays.jl"))
18-
using .Main.OffsetArrays
17+
include(joinpath(TESTHELPERS, "OffsetArrays.jl"))
18+
using .OffsetArrays
1919

20-
isdefined(Main, :DualNumbers) || @eval Main include(joinpath($TESTHELPERS, "DualNumbers.jl"))
21-
using .Main.DualNumbers
20+
include(joinpath(TESTHELPERS, "DualNumbers.jl"))
21+
using .DualNumbers
2222

23-
isdefined(Main, :FillArrays) || @eval Main include(joinpath($TESTHELPERS, "FillArrays.jl"))
24-
using .Main.FillArrays
23+
include(joinpath(TESTHELPERS, "FillArrays.jl"))
24+
using .FillArrays
2525

26-
isdefined(Main, :SizedArrays) || @eval Main include(joinpath($TESTHELPERS, "SizedArrays.jl"))
27-
using .Main.SizedArrays
26+
include(joinpath(TESTHELPERS, "SizedArrays.jl"))
27+
using .SizedArrays
2828

2929
Random.seed!(123)
3030

‎test/hessenberg.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ using Test, LinearAlgebra, Random
99
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
1010
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
1111

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

15-
isdefined(Main, :ImmutableArrays) || @eval Main include(joinpath($TESTHELPERS, "ImmutableArrays.jl"))
16-
using .Main.ImmutableArrays
15+
include(joinpath(TESTHELPERS, "ImmutableArrays.jl"))
16+
using .ImmutableArrays
1717

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

‎test/matmul.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ using LinearAlgebra: mul!, Symmetric, Hermitian
1111
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
1212
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
1313

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

1717
## Test Julia fallbacks to BLAS routines
1818

‎test/special.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ using LinearAlgebra: rmul!, BandIndex
1010
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
1111
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
1212

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

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

‎test/structuredbroadcast.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ using Test, LinearAlgebra
99
const BASE_TEST_PATH = joinpath(dirname(pathof(LinearAlgebra)), "..", "test")
1010
const TESTHELPERS = joinpath(BASE_TEST_PATH, "testhelpers")
1111

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

1515
@testset "broadcast[!] over combinations of scalars, structured matrices, and dense vectors/matrices" begin
1616
@testset for N in (0,1,2,10) # some edge cases, and a structured case

0 commit comments

Comments
 (0)