Skip to content

Commit 3dacbba

Browse files
c42fandyferris
authored andcommitted
Minor changes and cleanups (#233)
* Avoid Travis timouts by removing outer testset * Remove obsolete, hacky workaround for inference issue in 0.6-
1 parent 3819c74 commit 3dacbba

File tree

2 files changed

+34
-51
lines changed

2 files changed

+34
-51
lines changed

test/runtests.jl

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,35 @@ using Base.Test
33

44
include("testutil.jl")
55

6-
@testset "StaticArrays" begin
7-
include("SVector.jl")
8-
include("MVector.jl")
9-
include("SMatrix.jl")
10-
include("MMatrix.jl")
11-
include("SArray.jl")
12-
include("MArray.jl")
13-
include("FieldVector.jl")
14-
include("Scalar.jl")
15-
include("SUnitRange.jl")
16-
include("SizedArray.jl")
17-
include("custom_types.jl")
6+
include("SVector.jl")
7+
include("MVector.jl")
8+
include("SMatrix.jl")
9+
include("MMatrix.jl")
10+
include("SArray.jl")
11+
include("MArray.jl")
12+
include("FieldVector.jl")
13+
include("Scalar.jl")
14+
include("SUnitRange.jl")
15+
include("SizedArray.jl")
16+
include("custom_types.jl")
1817

19-
include("core.jl")
20-
include("abstractarray.jl")
21-
include("indexing.jl")
22-
include("mapreduce.jl")
23-
include("arraymath.jl")
24-
include("broadcast.jl")
25-
include("linalg.jl")
26-
include("matrix_multiply.jl")
27-
include("det.jl")
28-
include("inv.jl")
29-
include("solve.jl") # Strange inference / world-age error
30-
include("eigen.jl")
31-
include("expm.jl")
32-
include("sqrtm.jl")
33-
include("chol.jl")
34-
include("deque.jl")
35-
include("io.jl")
36-
include("svd.jl")
18+
include("core.jl")
19+
include("abstractarray.jl")
20+
include("indexing.jl")
21+
include("mapreduce.jl")
22+
include("arraymath.jl")
23+
include("broadcast.jl")
24+
include("linalg.jl")
25+
include("matrix_multiply.jl")
26+
include("det.jl")
27+
include("inv.jl")
28+
include("solve.jl")
29+
include("eigen.jl")
30+
include("expm.jl")
31+
include("sqrtm.jl")
32+
include("chol.jl")
33+
include("deque.jl")
34+
include("io.jl")
35+
include("svd.jl")
3736

38-
include("fixed_size_arrays.jl")
39-
end
37+
include("fixed_size_arrays.jl")

test/solve.jl

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,14 @@
1-
@testset "Solving linear system" begin
2-
3-
# I see an inference error in the combined testset below. I can't reproduce
4-
# at the REPL or in a function for individual n, etc... speculatively, it
5-
# might be reusing A, b with different types in the same (non-toplevel)
6-
# scope, for which I've come accross inference bugs in the past.
7-
8-
for n in (1,2,3,4),
9-
(m, v) in ((SMatrix{n,n}, SVector{n}), (MMatrix{n,n}, MVector{n})),
10-
elty in (Float64, Int)
1+
using StaticArrays, Base.Test
112

12-
eval(quote
13-
A = $elty.(rand(-99:2:99,$n,$n))
14-
b = A*ones($elty,$n)
15-
@test $m(A)\$v(b) A\b
16-
end)
17-
end
18-
19-
#=@testset "Problem size: $n x $n. Matrix type: $m. Element type: $elty" for n in (1,2,3,4),
3+
@testset "Solving linear system" begin
4+
@testset "Problem size: $n x $n. Matrix type: $m. Element type: $elty" for n in (1,2,3,4),
205
(m, v) in ((SMatrix{n,n}, SVector{n}), (MMatrix{n,n}, MVector{n})),
216
elty in (Float64, Int)
227

238
A = elty.(rand(-99:2:99,n,n))
249
b = A*ones(elty,n)
2510
@test m(A)\v(b) A\b
26-
end =#
11+
end
2712

2813
m1 = @SMatrix eye(5)
2914
m2 = @SMatrix eye(2)

0 commit comments

Comments
 (0)