@@ -572,6 +572,8 @@ macro(add_instancetests instances settings prefix)
572
572
# treat the instance as a tuple (list) of two values
573
573
#
574
574
if (NOT ((${setting} STREQUAL "tolerance" ) AND (${basename} STREQUAL "blend2.mps" ) AND (${LPS} STREQUAL "xprs" )))
575
+ if (NOT ((${setting} STREQUAL "default" ) AND (${basename} STREQUAL "pltexpA4_6.smps" ) AND (${LPS} STREQUAL "xprs" )))
576
+ if (NOT ((${setting} STREQUAL "convertinttobin_mostinf" ) AND (${basename} STREQUAL "bell5.mps" ) AND (${LPS} STREQUAL "cpx" )))
575
577
add_test (NAME ${prefix} -${setting}-${basename}
576
578
COMMAND $< TARGET_FILE:scip> -f ${PROJECT_SOURCE_DIR} /check/${path} -s ${PROJECT_SOURCE_DIR} /check/coverage/settings/${setting}.set -o ${optval} ${optval}
577
579
)
@@ -582,6 +584,8 @@ macro(add_instancetests instances settings prefix)
582
584
FAIL_REGULAR_EXPRESSION "WARNING: unknown parameter;user parameter file <${PROJECT_SOURCE_DIR} /check/coverage/settings/${setting} .set> not found"
583
585
DEPENDS scip-build
584
586
)
587
+ endif () # integrality violated in multiaggregated integer variable, #3724 (LPS=cpx, MIP-convertinttobin_mostinf-bell5.mps)
588
+ endif () # LP Error: Xpress returned 120, #3724 (LPS=xprs, Stochastic-default-pltexpA4_6.smps)
585
589
endif () # Xpress does not keep feasibility tolerance setting, #3640
586
590
endforeach (setting )
587
591
endforeach (instance )
@@ -606,6 +610,7 @@ if((${TEST_BENDERSQP} AND (NOT ${LPS} STREQUAL "msk" )) OR (NOT ${prefix} STREQU
606
610
#
607
611
# treat the instance as a tuple (list) of two values
608
612
#
613
+ if (NOT ((${basename} STREQUAL "classical_30_0.mps" ) AND (${LPS} STREQUAL "grb" )))
609
614
add_test (NAME ${prefix} -${setting}-${basename}
610
615
COMMAND $< TARGET_FILE:scip> -c "set load ${PROJECT_SOURCE_DIR} /check/coverage/settings/${setting} .set read ${PROJECT_SOURCE_DIR} /check/${instpath} read ${PROJECT_SOURCE_DIR} /check/${decpath} opt validatesol ${optval} ${optval} q"
611
616
)
@@ -617,6 +622,7 @@ if((${TEST_BENDERSQP} AND (NOT ${LPS} STREQUAL "msk" )) OR (NOT ${prefix} STREQU
617
622
FAIL_REGULAR_EXPRESSION "user parameter file <${PROJECT_SOURCE_DIR} /check/coverage/settings/${setting} .set> not found"
618
623
DEPENDS scip-build
619
624
)
625
+ endif () # separation does not converge, #3724 (LPS=grb, BendersQP-benders-qp-classical_30_0.mps)
620
626
endforeach (setting )
621
627
endforeach (instance )
622
628
endif ()
@@ -828,6 +834,7 @@ if(NOT ${TPI} STREQUAL "none")
828
834
# configure the batch file for this test by substituting placeholders in the in.file
829
835
#
830
836
configure_file (interactiveshell/concurrentsolve.bat.in interactiveshell/concurrentsolve-${basename}.bat )
837
+ if (NOT ((${basename} STREQUAL "egout.mps" ) AND (${LPS} STREQUAL "spx" ) AND (${TPI} STREQUAL "tny" )))
831
838
add_test (NAME MIP-concurrentsolve-${basename}
832
839
COMMAND $< TARGET_FILE:scip> -b ${PROJECT_BINARY_DIR} /check/interactiveshell/concurrentsolve-${basename}.bat
833
840
)
@@ -837,6 +844,7 @@ if(NOT ${TPI} STREQUAL "none")
837
844
FAIL_REGULAR_EXPRESSION ERROR
838
845
DEPENDS scip-build
839
846
)
847
+ endif () # Timeout (deadlock?), #3724 (MIP-concurrentsolve-egout.mps, LPS=spx bugfix)
840
848
endforeach (instance )
841
849
endif ()
842
850
0 commit comments