Skip to content

Commit c1b8b4b

Browse files
committed
Merge remote-tracking branch 'origin/v10-minor'
2 parents 884ec7f + 813720d commit c1b8b4b

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

check/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,6 +1380,7 @@ if(SCIP_WITH_EXACTSOLVE)
13801380
# loop over all settings
13811381
#
13821382
foreach(setting ${settings_MIPEX})
1383+
if(NOT ((${basename} STREQUAL "enigma.mps") AND (${setting} STREQUAL "exact-exactlp") AND (${LPS} STREQUAL "msk"))) # certificate.cpp:3194 assert failing, #4261
13831384
#
13841385
# treat the instance as a tuple (list) of two values
13851386
#
@@ -1395,6 +1396,7 @@ if(SCIP_WITH_EXACTSOLVE)
13951396
FAIL_REGULAR_EXPRESSION "user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
13961397
DEPENDS scip-build
13971398
)
1399+
endif()
13981400
endforeach(setting)
13991401
endforeach(instance ${instances_MIPEX})
14001402
#
@@ -1406,6 +1408,7 @@ if(SCIP_WITH_EXACTSOLVE)
14061408
# loop over all settings
14071409
#
14081410
foreach(setting ${settings_MIPEX})
1411+
if(NOT ((${basename} STREQUAL "enigma.mps") AND ((${setting} STREQUAL "exact-exactlp") OR (${setting} STREQUAL "exact-projshift")) AND (${LPS} STREQUAL "grb"))) # certificate.cpp:3194 assert failing, #4261
14091412
#
14101413
# treat the instance as a tuple (list) of two values
14111414
#
@@ -1452,6 +1455,7 @@ if(SCIP_WITH_EXACTSOLVE)
14521455
FAIL_REGULAR_EXPRESSION "Failed")
14531456
endif()
14541457

1458+
endif()
14551459
endforeach(setting)
14561460
endforeach(instance ${instances_MIPEX})
14571461
endif()

0 commit comments

Comments
 (0)