Skip to content

Commit 297db71

Browse files
committed
Merge remote-tracking branch 'origin/v10-minor'
2 parents 8039e6f + 0908808 commit 297db71

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

check/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,6 +1329,7 @@ if(SCIP_WITH_EXACTSOLVE)
13291329
configure_file(interactiveshell/readertest-wrongformat.bat.in interactiveshell/readertest-${extension}-${basename}.bat)
13301330
set(regex "${message_format_${extension}}")
13311331
endif()
1332+
if(NOT ((${extension} STREQUAL "cip") AND (${basename} STREQUAL "rgn.zpl") AND (${LPS} STREQUAL "xprs")))
13321333
add_test(NAME MIPEX-readertest-${extension}-${basename}
13331334
COMMAND $<TARGET_FILE:scip>
13341335
-c "set load ${PROJECT_SOURCE_DIR}/check/coverage/settings/exact-default.set"
@@ -1340,6 +1341,7 @@ if(SCIP_WITH_EXACTSOLVE)
13401341
FAIL_REGULAR_EXPRESSION "ERROR"
13411342
DEPENDS scip-build
13421343
)
1344+
endif() # LP Error: Xpress returned 11, #3724
13431345
endforeach(extension)
13441346
endforeach(instance)
13451347
#

0 commit comments

Comments
 (0)