Skip to content

Commit e02bf36

Browse files
committed
Make tests pass on Julia nightly
1 parent ecd97f3 commit e02bf36

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

lib/ControlSystemsBase/test/test_statespace.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,11 @@
9898
@test C_111 .* C_222 == ss([-5 0 2 0; 0 -5 0 2; 0 0 -5 -3; 0 0 2 -9], [0 0; 0 0; 1 0; 0 2], [3 0 0 0; 0 3 0 0], 0)
9999
@test Ref(ss(1)) .* [C_111, C_111] == [C_111, C_111]
100100

101-
@test_broken @inferred C_111 * C_221
101+
if version >= v"1.10.0-rc2"
102+
@inferred C_111 * C_221
103+
else
104+
@test_broken @inferred C_111 * C_221
105+
end
102106
@test_broken @inferred C_111 .* I(2)
103107

104108
C_111_d = ssrand(1,1,2)

lib/ControlSystemsBase/test/test_transferfunction.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@ tf(vecarray(1, 2, [0], [0]), vecarray(1, 2, [1], [1]), 0.005)
103103
@test minreal(C_111.*C_222 - C_222.*C_111, 1e-3) == tf(ss(0*I(2))) # scalar times MIMO
104104
@test C_111 .* C_222 == (C_111 .* I(2)) * C_222
105105

106-
@test_broken @inferred C_111 .* I(2)
106+
if version >= v"1.10.0-rc2"
107+
@inferred C_111 .* I(2)
108+
else
109+
@test_broken @inferred C_111 .* I(2)
110+
end
107111

108112
C_111_d = tf(ssrand(1,1,2))
109113
M = ones(2,2)

0 commit comments

Comments
 (0)