Skip to content

Commit 7d28b34

Browse files
committed
Merge branch '3724-skip-fails' into 'v91-bugfix'
skip ctest fails See merge request integer/scip!3471
2 parents f13674b + 4327851 commit 7d28b34

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

applications/CycleClustering/check/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ foreach(instance ${instances})
3838
#
3939
# call the Binpacking binary and validate the solve with the given objective value
4040
#
41+
if(NOT DEFINED LPS)
42+
# just for the following if() to compile also if LPS is not defined
43+
set(LPS "unknown")
44+
endif()
45+
if(NOT ((${basename} STREQUAL "Pot/6Cycle/Pot6_T_20.txt_6cluster") AND (${LPS} STREQUAL "xprs")))
4146
add_test(NAME "applications-cycleclustering-${basename}-${setting}"
4247
COMMAND $<TARGET_FILE:cycleclustering> -f ${CMAKE_CURRENT_SOURCE_DIR}/../instances/${basename}.cyc -s ${CMAKE_CURRENT_SOURCE_DIR}/../settings/${setting}.set
4348
)
@@ -55,5 +60,6 @@ foreach(instance ${instances})
5560
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin/$<CONFIG>
5661
)
5762
endif()
63+
endif() # LP Error: Xpress returned 120, #3724 (LPS=xprs, applications-cycleclustering-Pot/6Cycle/Pot6_T_20.txt_6cluster-{default,nosepa})
5864
endforeach()
5965
endforeach()

check/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,8 @@ macro(add_instancetests instances settings prefix)
572572
# treat the instance as a tuple (list) of two values
573573
#
574574
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")))
575577
add_test(NAME ${prefix}-${setting}-${basename}
576578
COMMAND $<TARGET_FILE:scip> -f ${PROJECT_SOURCE_DIR}/check/${path} -s ${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set -o ${optval} ${optval}
577579
)
@@ -582,6 +584,8 @@ macro(add_instancetests instances settings prefix)
582584
FAIL_REGULAR_EXPRESSION "WARNING: unknown parameter;user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
583585
DEPENDS scip-build
584586
)
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)
585589
endif() # Xpress does not keep feasibility tolerance setting, #3640
586590
endforeach(setting)
587591
endforeach(instance)
@@ -606,6 +610,7 @@ if((${TEST_BENDERSQP} AND (NOT ${LPS} STREQUAL "msk" )) OR (NOT ${prefix} STREQU
606610
#
607611
# treat the instance as a tuple (list) of two values
608612
#
613+
if(NOT ((${basename} STREQUAL "classical_30_0.mps") AND (${LPS} STREQUAL "grb")))
609614
add_test(NAME ${prefix}-${setting}-${basename}
610615
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"
611616
)
@@ -617,6 +622,7 @@ if((${TEST_BENDERSQP} AND (NOT ${LPS} STREQUAL "msk" )) OR (NOT ${prefix} STREQU
617622
FAIL_REGULAR_EXPRESSION "user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
618623
DEPENDS scip-build
619624
)
625+
endif() # separation does not converge, #3724 (LPS=grb, BendersQP-benders-qp-classical_30_0.mps)
620626
endforeach(setting)
621627
endforeach(instance)
622628
endif()
@@ -828,6 +834,7 @@ if(NOT ${TPI} STREQUAL "none")
828834
# configure the batch file for this test by substituting placeholders in the in.file
829835
#
830836
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")))
831838
add_test(NAME MIP-concurrentsolve-${basename}
832839
COMMAND $<TARGET_FILE:scip> -b ${PROJECT_BINARY_DIR}/check/interactiveshell/concurrentsolve-${basename}.bat
833840
)
@@ -837,6 +844,7 @@ if(NOT ${TPI} STREQUAL "none")
837844
FAIL_REGULAR_EXPRESSION ERROR
838845
DEPENDS scip-build
839846
)
847+
endif() # Timeout (deadlock?), #3724 (MIP-concurrentsolve-egout.mps, LPS=spx bugfix)
840848
endforeach(instance)
841849
endif()
842850

tests/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ if( CRITERION_FOUND )
132132
set( ADDITIONAL_FLAGS "" )
133133
endif()
134134

135+
if(NOT ((${testName} STREQUAL "unittest-cons-nonlinear-vertexpolyhedral") AND (${LPS} STREQUAL "xprs")))
135136
add_test(NAME ${testName}
136137
COMMAND $<TARGET_FILE:${testName}> ${ADDITIONAL_FLAGS}
137138
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -141,5 +142,6 @@ if( CRITERION_FOUND )
141142
DEPENDS ${testName}-build
142143
RESOURCE_LOCK libscip
143144
)
145+
endif() # LP Error: Xpress returned 120, #3724 (LPS=xprs, unittest-cons-nonlinear-vertexpolyhedral)
144146
endforeach(testSrc)
145147
endif()

0 commit comments

Comments
 (0)