Merge branch 'ctest-gurobi1003' into 'v80-bugfix'

unskip lns_epsgreedy_vanilla/blend2.mps/grb See merge request integer/scip!3267
scipopt · Dec 12, 2023 · b48df6f · b48df6f
2 parents b924e8a + 9863c65
commit b48df6f
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/check/CMakeLists.txt b/check/CMakeLists.txt
@@ -549,7 +549,6 @@ macro(add_instancetests instances settings prefix)
             #
             # treat the instance as a tuple (list) of two values
             #
-            if(NOT ((${setting} STREQUAL "lns_epsgreedy_vanilla") AND (${basename} STREQUAL "blend2.mps") AND (${LPS} STREQUAL "grb")))
             if(NOT ((${setting} STREQUAL "tolerance") AND (${basename} STREQUAL "blend2.mps") AND (${LPS} STREQUAL "xprs")))
             add_test(NAME ${prefix}-${setting}-${basename}
                     COMMAND $<TARGET_FILE:scip> -f ${PROJECT_SOURCE_DIR}/check/${path} -s ${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set -o ${optval} ${optval}
@@ -561,7 +560,6 @@ macro(add_instancetests instances settings prefix)
                                     FAIL_REGULAR_EXPRESSION "WARNING: unknown parameter;user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
                                     DEPENDS scip-build
                                 )
-            endif()  # Gurobi gets stuck in LP solve, #2833
             endif()  # Xpress does not keep feasibility tolerance setting, #3640
         endforeach(setting)
     endforeach(instance)