Skip to content

Commit 9647518

Browse files
committed
math_opt: disable tests incompatible with HiGHS 1.7+ or SCIP v1.10.0
1 parent 5de2991 commit 9647518

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

ortools/math_opt/solver_tests/callback_tests.cc

+3
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,9 @@ TEST_P(CallbackTest, EventSolutionFilter) {
671671
}
672672

673673
TEST_P(CallbackTest, EventNodeCut) {
674+
if (GetParam().solver_type == SolverType::kGscip) {
675+
GTEST_SKIP() << "This test does not work with SCIP v900";
676+
}
674677
if (!GetParam().supported_events.contains(CallbackEvent::kMipNode)) {
675678
GTEST_SKIP() << "Test skipped because this solver does not support "
676679
"CallbackEvent::kMipNode.";

ortools/math_opt/solver_tests/ip_parameter_tests.cc

+6
Original file line numberDiff line numberDiff line change
@@ -1099,6 +1099,9 @@ TEST_P(LargeInstanceIpParameterTest, IterationLimit) {
10991099
}
11001100

11011101
TEST_P(LargeInstanceIpParameterTest, NodeLimit) {
1102+
if (GetParam().solver_type == SolverType::kHighs) {
1103+
GTEST_SKIP() << "Ignoring this test as Highs 1.7+ returns unimplemented";
1104+
}
11021105
ASSERT_OK_AND_ASSIGN(std::unique_ptr<Model> model, Load23588());
11031106
SolveParameters params = GetParam().base_parameters;
11041107
params.node_limit = 1;
@@ -1219,6 +1222,9 @@ TEST_P(LargeInstanceIpParameterTest, BestBoundLimit) {
12191222
}
12201223

12211224
TEST_P(LargeInstanceIpParameterTest, SolutionLimit) {
1225+
if (GetParam().solver_type == SolverType::kHighs) {
1226+
GTEST_SKIP() << "Ignoring this test as Highs 1.7+ returns unimplemented";
1227+
}
12221228
ASSERT_OK_AND_ASSIGN(std::unique_ptr<Model> model, Load23588());
12231229
SolveParameters params = GetParam().base_parameters;
12241230
params.solution_limit = 1;

ortools/math_opt/solver_tests/status_tests.cc

+3
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,9 @@ TEST_P(StatusTest, IncompleteIpSolve) {
373373
GTEST_SKIP() << "Ignoring this test as it is an IP-only test and requires "
374374
"support for node_limit.";
375375
}
376+
if (GetParam().solver_type == SolverType::kHighs) {
377+
GTEST_SKIP() << "Ignoring this test as Highs 1.7+ returns MODEL_INVALID";
378+
}
376379
ASSERT_OK_AND_ASSIGN(const std::unique_ptr<const Model> model, Load23588());
377380
SolveArguments args = {
378381
.parameters = {.enable_output = true, .node_limit = 1}};

0 commit comments

Comments
 (0)