Skip to content

Commit

Permalink
Merge branch 'fix-vanilla-branching' into 'v91-bugfix'
Browse files Browse the repository at this point in the history 
Fix vanilla test

See merge request integer/scip!3497
  • Loading branch information
@DominikKamp
DominikKamp committed Aug 30, 2024
2 parents 6b8c4b5 + 21b7c5c commit 6dd602b
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 18 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ Unit tests
Testing
-------

- allow unknown parameters to let tests pass if only optional dependencies are missing

Build system
------------

Expand Down
37 changes: 19 additions & 18 deletions check/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,8 @@ macro(add_instancetests instances settings prefix)
set_tests_properties(${prefix}-${setting}-${basename}
PROPERTIES
PASS_REGULAR_EXPRESSION "Validation : Success"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "WARNING: unknown parameter;user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
FAIL_REGULAR_EXPRESSION "ERROR"
FAIL_REGULAR_EXPRESSION "user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
DEPENDS scip-build
)
endif() # integrality violated in multiaggregated integer variable, #3724 (LPS=cpx, MIP-convertinttobin_mostinf-bell5.mps)
Expand Down Expand Up @@ -619,8 +619,7 @@ if((${TEST_BENDERSQP} AND (NOT ${LPS} STREQUAL "msk" )) OR (NOT ${prefix} STREQU
set_tests_properties(${prefix}-${setting}-${basename}
PROPERTIES
PASS_REGULAR_EXPRESSION "Validation : Success"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "WARNING: unknown parameter"
FAIL_REGULAR_EXPRESSION "ERROR"
FAIL_REGULAR_EXPRESSION "user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
DEPENDS scip-build
)
Expand All @@ -645,8 +644,8 @@ macro(add_pairtests pairs prefix)
set_tests_properties(${prefix}-${setting}-${basename}
PROPERTIES
PASS_REGULAR_EXPRESSION "Validation : Success"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "WARNING: unknown parameter;user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
FAIL_REGULAR_EXPRESSION "ERROR"
FAIL_REGULAR_EXPRESSION "user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
DEPENDS scip-build
)
endforeach(pair)
Expand Down Expand Up @@ -693,7 +692,7 @@ foreach(instance ${instances_MINLP})
set_tests_properties(MINLP-solutiontest-${basename}
PROPERTIES
PASS_REGULAR_EXPRESSION "Validation : Success"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
DEPENDS scip-build
)
endforeach(instance)
Expand All @@ -713,7 +712,7 @@ foreach(instance ${instances_Indicator})
set_tests_properties(Indicator-solvecip-${basename}
PROPERTIES
PASS_REGULAR_EXPRESSION "Validation : Success"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
DEPENDS scip-build
)
endforeach(instance)
Expand All @@ -733,7 +732,8 @@ foreach(instance ${instances_Objlim})
set_tests_properties(Objlim-${setting}-${basename}
PROPERTIES
PASS_REGULAR_EXPRESSION "Validation : Success"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
FAIL_REGULAR_EXPRESSION "user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
DEPENDS scip-build
)
endforeach(instance)
Expand Down Expand Up @@ -787,7 +787,7 @@ foreach(instance ${instances_MIP_write})
set_tests_properties(MIP-writeronlytest-${extension}-${basename}
PROPERTIES
PASS_REGULAR_EXPRESSION ${regex}
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
DEPENDS scip-build
)
endforeach(extension)
Expand Down Expand Up @@ -820,7 +820,7 @@ foreach(instance ${instances_MIP})
set_tests_properties(MIP-readertest-${extension}-${basename}
PROPERTIES
PASS_REGULAR_EXPRESSION ${regex}
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
DEPENDS scip-build
)
endforeach(extension)
Expand All @@ -843,7 +843,7 @@ if(NOT ${TPI} STREQUAL "none")
set_tests_properties(MIP-concurrentsolve-${basename}
PROPERTIES
PASS_REGULAR_EXPRESSION "Validation : Success"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
DEPENDS scip-build
)
endif() # Timeout (deadlock?), #3724 (MIP-concurrentsolve-egout.mps, LPS=spx bugfix)
Expand Down Expand Up @@ -872,7 +872,7 @@ foreach(instance ${instances_MIP})
set_tests_properties(MIP-mipstart-${basename}
PROPERTIES
PASS_REGULAR_EXPRESSION "Validation : Success"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
# the MIP start instances are validated twice.
FAIL_REGULAR_EXPRESSION "Validation : Fail"
DEPENDS scip-build
Expand All @@ -894,15 +894,15 @@ add_test(NAME interactiveshell
set_tests_properties(interactiveshell
PROPERTIES
PASS_REGULAR_EXPRESSION "increased branching priority of new binary variables"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
DEPENDS scip-build
)
add_test(NAME write_and_read_settings
COMMAND $<TARGET_FILE:scip> -b ${CMAKE_CURRENT_SOURCE_DIR}/interactiveshell/write_and_read_settings.bat
)
set_tests_properties(write_and_read_settings
PROPERTIES
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
DEPENDS scip-build
)

Expand All @@ -921,7 +921,8 @@ foreach(testname reopt-chg-obj-stein27 reopt-chg-obj-flugpl reopt-chg-obj-1-Full
)
set_tests_properties(${testname}-${setting} PROPERTIES
PASS_REGULAR_EXPRESSION "Validation : Success"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
FAIL_REGULAR_EXPRESSION "user parameter file <${PROJECT_SOURCE_DIR}/check/coverage/settings/${setting}.set> not found"
DEPENDS scip-build)
endforeach()
endforeach()
Expand Down Expand Up @@ -1050,7 +1051,7 @@ foreach(instance ${instances_MIP})
set_tests_properties(MIP-linclass-${basename}
PROPERTIES
PASS_REGULAR_EXPRESSION "${pass_regex}"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
)
endif()
endforeach()
Expand Down Expand Up @@ -1117,7 +1118,7 @@ if (UNIX)
DEPENDS scip-build
# I assume that this test takes longer than 2 seconds
PASS_REGULAR_EXPRESSION "termination signal received"
FAIL_REGULAR_EXPRESSION ERROR
FAIL_REGULAR_EXPRESSION "ERROR"
)
endif (UNIX)
endif()
Expand Down

0 comments on commit 6dd602b

Please sign in to comment.