Skip to content

Commit a95de40

Browse files
committed
Merge remote-tracking branch 'origin/v92-bugfix' into v10-minor
2 parents b4e7226 + a7cd9e3 commit a95de40

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

applications/CycleClustering/check/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ foreach(instance ${instances})
4848
)
4949
set_tests_properties("applications-cycleclustering-${basename}-${setting}"
5050
PROPERTIES
51-
PASS_REGULAR_EXPRESSION "optimal solution found"
51+
PASS_REGULAR_EXPRESSION "optimal solution found"
5252
FAIL_REGULAR_EXPRESSION "ERROR"
5353
DEPENDS applications-cycleclustering-build
5454
RESOURCE_LOCK libscip

applications/Ringpacking/tests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ if( CRITERION_FOUND )
138138
set_tests_properties(${testName}
139139
PROPERTIES
140140
DEPENDS ${testName}-build
141+
RESOURCE_LOCK libscip
141142
)
142143
endforeach(testSrc)
143144
endif()

examples/SCFLP/check/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ foreach(instance ${instances})
6666
PROPERTIES
6767
PASS_REGULAR_EXPRESSION "Validation : Success"
6868
DEPENDS examples-scflp-build
69+
RESOURCE_LOCK libscip
6970
)
7071
if(WIN32)
7172
# on windows we need to execute the application and examples executables from the directory containing the libscip.dll,
@@ -96,6 +97,7 @@ if( DEFINED IPOPT_FOUND AND DEFINED LPS )
9697
PROPERTIES
9798
PASS_REGULAR_EXPRESSION "Validation : Success"
9899
DEPENDS examples-scflp-build
100+
RESOURCE_LOCK libscip
99101
)
100102
if(WIN32)
101103
# on windows we need to execute the application and examples executables from the directory containing the libscip.dll,
@@ -117,6 +119,7 @@ if( DEFINED IPOPT_FOUND AND DEFINED LPS )
117119
PROPERTIES
118120
PASS_REGULAR_EXPRESSION "Validation : Success"
119121
DEPENDS examples-scflp-build
122+
RESOURCE_LOCK libscip
120123
)
121124
if(WIN32)
122125
# on windows we need to execute the application and examples executables from the directory containing the libscip.dll,

0 commit comments

Comments
 (0)