diff --git a/ortools/math_opt/solver_tests/ip_parameter_tests.cc b/ortools/math_opt/solver_tests/ip_parameter_tests.cc index 883b4584ca..bcfc4f3eea 100644 --- a/ortools/math_opt/solver_tests/ip_parameter_tests.cc +++ b/ortools/math_opt/solver_tests/ip_parameter_tests.cc @@ -1099,6 +1099,9 @@ TEST_P(LargeInstanceIpParameterTest, IterationLimit) { } TEST_P(LargeInstanceIpParameterTest, NodeLimit) { + if (GetParam().solver_type == SolverType::kHighs) { + GTEST_SKIP() << "Ignoring this test as Highs 1.7+ returns unimplemented"; + } ASSERT_OK_AND_ASSIGN(std::unique_ptr model, Load23588()); SolveParameters params = GetParam().base_parameters; params.node_limit = 1; @@ -1219,6 +1222,9 @@ TEST_P(LargeInstanceIpParameterTest, BestBoundLimit) { } TEST_P(LargeInstanceIpParameterTest, SolutionLimit) { + if (GetParam().solver_type == SolverType::kHighs) { + GTEST_SKIP() << "Ignoring this test as Highs 1.7+ returns unimplemented"; + } ASSERT_OK_AND_ASSIGN(std::unique_ptr model, Load23588()); SolveParameters params = GetParam().base_parameters; params.solution_limit = 1; diff --git a/ortools/math_opt/solver_tests/status_tests.cc b/ortools/math_opt/solver_tests/status_tests.cc index a3a9e660b4..1d888351b7 100644 --- a/ortools/math_opt/solver_tests/status_tests.cc +++ b/ortools/math_opt/solver_tests/status_tests.cc @@ -99,6 +99,9 @@ TEST_P(StatusTest, PrimalAndDualInfeasible) { << "Ignoring this test as GLPK gets stuck in presolve for IP's " "with a primal-dual infeasible LP relaxation."; } + if (GetParam().solver_type == SolverType::kHighs) { + GTEST_SKIP() << "Ignoring this test as Highs 1.7+ returns error."; + } Model model; const Variable x1 = @@ -373,6 +376,9 @@ TEST_P(StatusTest, IncompleteIpSolve) { GTEST_SKIP() << "Ignoring this test as it is an IP-only test and requires " "support for node_limit."; } + if (GetParam().solver_type == SolverType::kHighs) { + GTEST_SKIP() << "Ignoring this test as Highs 1.7+ returns MODEL_INVALID"; + } ASSERT_OK_AND_ASSIGN(const std::unique_ptr model, Load23588()); SolveArguments args = { .parameters = {.enable_output = true, .node_limit = 1}};