From 1a43d52eef1cbd21742ab41b0e73c8386c1b50f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Mon, 3 Mar 2025 16:44:38 +0100 Subject: [PATCH 1/4] Use regex for tests --- test/MOI_wrapper.jl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/MOI_wrapper.jl b/test/MOI_wrapper.jl index d06d2f5..d2b3682 100644 --- a/test/MOI_wrapper.jl +++ b/test/MOI_wrapper.jl @@ -33,11 +33,11 @@ function test_runtests() exclude = String[ # ZerosBridge does not support ConstraintDual. These are tested below in # test_runtests_ZerosBridge - "test_conic_RotatedSecondOrderCone_INFEASIBLE_2", - "test_conic_linear_VectorOfVariables_2", - "test_linear_integration", - "test_quadratic_constraint_GreaterThan", - "test_quadratic_constraint_LessThan", + r"test_conic_RotatedSecondOrderCone_INFEASIBLE_2$", + r"test_conic_linear_VectorOfVariables_2$", + r"test_linear_integration$", + r"test_quadratic_constraint_GreaterThan$", + r"test_quadratic_constraint_LessThan$", ] if Sys.WORD_SIZE == 32 # These tests fail on x86 Linux, returning ITERATION_LIMIT instead of From d94f684164be9cf26576798b327bd48a41fa5516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Mon, 3 Mar 2025 17:31:18 +0100 Subject: [PATCH 2/4] Fix --- test/MOI_wrapper.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/MOI_wrapper.jl b/test/MOI_wrapper.jl index d2b3682..1dc6b45 100644 --- a/test/MOI_wrapper.jl +++ b/test/MOI_wrapper.jl @@ -30,7 +30,7 @@ function test_runtests() @test model.optimizer.model.model_cache isa MOI.Utilities.UniversalFallback{ECOS.OptimizerCache} MOI.set(model, MOI.Silent(), true) - exclude = String[ + exclude = [ # ZerosBridge does not support ConstraintDual. These are tested below in # test_runtests_ZerosBridge r"test_conic_RotatedSecondOrderCone_INFEASIBLE_2$", From 53a501d0afb9d0c806cedb30a7986032a4d1f4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Mon, 3 Mar 2025 17:49:55 +0100 Subject: [PATCH 3/4] Fix --- test/MOI_wrapper.jl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/MOI_wrapper.jl b/test/MOI_wrapper.jl index 1dc6b45..540a040 100644 --- a/test/MOI_wrapper.jl +++ b/test/MOI_wrapper.jl @@ -42,8 +42,8 @@ function test_runtests() if Sys.WORD_SIZE == 32 # These tests fail on x86 Linux, returning ITERATION_LIMIT instead of # proving {primal,dual}_INFEASIBLE. - push!(exclude, "test_conic_linear_INFEASIBLE") - push!(exclude, "test_solve_TerminationStatus_DUAL_INFEASIBLE") + push!(exclude, r"test_conic_linear_INFEASIBLE$") + push!(exclude, r"test_solve_TerminationStatus_DUAL_INFEASIBLE$") end MOI.Test.runtests( model, @@ -84,11 +84,11 @@ function test_runtests_ZerosBridge() ), include = String[ # ZerosBridge does not support ConstraintDual - "test_conic_RotatedSecondOrderCone_INFEASIBLE_2", - "test_conic_linear_VectorOfVariables_2", - "test_linear_integration", - "test_quadratic_constraint_GreaterThan", - "test_quadratic_constraint_LessThan", + r"test_conic_RotatedSecondOrderCone_INFEASIBLE_2", + r"test_conic_linear_VectorOfVariables_2", + r"test_linear_integration", + r"test_quadratic_constraint_GreaterThan", + r"test_quadratic_constraint_LessThan", ], ) return From df805a11e2e2dc3531d31e20f09e449294a8cb55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Mon, 3 Mar 2025 21:36:24 +0100 Subject: [PATCH 4/4] Update test/MOI_wrapper.jl --- test/MOI_wrapper.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/MOI_wrapper.jl b/test/MOI_wrapper.jl index 540a040..71a4363 100644 --- a/test/MOI_wrapper.jl +++ b/test/MOI_wrapper.jl @@ -82,7 +82,7 @@ function test_runtests_ZerosBridge() MOI.ObjectiveBound, ], ), - include = String[ + include = [ # ZerosBridge does not support ConstraintDual r"test_conic_RotatedSecondOrderCone_INFEASIBLE_2", r"test_conic_linear_VectorOfVariables_2",