Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions test/Project.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[deps]
Convex = "f65535da-76fb-5f13-bab9-19810c17039a"
Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
Expand All @@ -7,4 +8,5 @@ TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
Convex = "0.14"
Krylov = "0.7.7"
20 changes: 10 additions & 10 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const TvTYPES = [Float32, Float64, BigFloat]

# Check That Tulip.version() matches what's in the Project.toml
tlp_ver = Tulip.version()
toml_ver = TOML.parsefile("../Project.toml")["version"]
toml_ver = TOML.parsefile(joinpath(@__DIR__, "Project.toml"))["version"]

@ericphanson ericphanson Nov 15, 2021

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is an unrelated fix; .. is relative to the working directory, while @__DIR__ is the (absolute path of the) directory of the file itself, so I think this should be more reliable (e.g. it let me do include("test/runtest.jl") without having to switch to the test directory). Let me know if this is undesired and I can undo it.

edit: oops, forgot .., added it in the next commit

@test tlp_ver == VersionNumber(toml_ver)

@testset "Unit tests" begin
Expand Down Expand Up @@ -47,14 +47,14 @@ end
include("Interfaces/MOI_wrapper.jl")
end

# @testset "Convex Problem Depot tests" begin
# for T in TvTYPES
# @testset "$T" begin
# Convex.ProblemDepot.run_tests(; exclude=[r"mip", r"exp", r"socp", r"sdp"], T = T) do problem
# Convex.solve!(problem, () -> Tulip.Optimizer{T}())
# end
# end
# end
# end
@testset "Convex Problem Depot tests" begin
for T in TvTYPES
@testset "$T" begin
Convex.ProblemDepot.run_tests(; exclude=[r"mip", r"exp", r"socp", r"sdp"], T = T) do problem
Convex.solve!(problem, () -> Tulip.Optimizer{T}())
end
end
end
end

end # Tulip tests