Merge remote-tracking branch 'origin/v10-minor'

Author: scip-ci

applications/CycleClustering/check/CMakeLists.txt

@@ -48,7 +48,7 @@ foreach(instance ${instances})
                 )
         set_tests_properties("applications-cycleclustering-${basename}-${setting}"
                             PROPERTIES
-				PASS_REGULAR_EXPRESSION "optimal solution found"
+                                PASS_REGULAR_EXPRESSION "optimal solution found"
                                 FAIL_REGULAR_EXPRESSION "ERROR"
                                 DEPENDS applications-cycleclustering-build
                                 RESOURCE_LOCK libscip

applications/PBSolver/check/CMakeLists.txt

@@ -42,6 +42,7 @@ foreach(instance ${instances})
     PASS_REGULAR_EXPRESSION "\no ${optval}(\n.*)?\ns OPTIMUM FOUND"
     FAIL_REGULAR_EXPRESSION "ERROR|\no ${optval}(\n.*)?\no "
     DEPENDS applications-pbsolver-build
+    RESOURCE_LOCK libscip
     )
   if(WIN32)
     # on windows we need to execute the application and examples executables from the directory containing the libscip.dll,

applications/Ringpacking/tests/CMakeLists.txt

@@ -138,6 +138,7 @@ if( CRITERION_FOUND )
     set_tests_properties(${testName}
       PROPERTIES
       DEPENDS ${testName}-build
+      RESOURCE_LOCK libscip
       )
   endforeach(testSrc)
 endif()

examples/SCFLP/check/CMakeLists.txt

@@ -66,6 +66,7 @@ foreach(instance ${instances})
                         PROPERTIES
                             PASS_REGULAR_EXPRESSION "Validation         : Success"
                             DEPENDS examples-scflp-build
+                            RESOURCE_LOCK libscip
                         )
     if(WIN32)
         # 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 )
                               PROPERTIES
                                   PASS_REGULAR_EXPRESSION "Validation         : Success"
                                   DEPENDS examples-scflp-build
+                                  RESOURCE_LOCK libscip
                               )
           if(WIN32)
               # 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 )
                               PROPERTIES
                                   PASS_REGULAR_EXPRESSION "Validation         : Success"
                                   DEPENDS examples-scflp-build
+                                  RESOURCE_LOCK libscip
                               )
           if(WIN32)
               # on windows we need to execute the application and examples executables from the directory containing the libscip.dll,

make/make.project

@@ -158,7 +158,8 @@ XPRESS_BIN      ?= xpress
 
 # code check and doxygen
 DOXY            ?= doxygen
-LINT            ?= flexelint
+# need to overwrite builtin variable LINT=lint
+LINT             = flexelint
 PCLINT          ?= pclint
 PCLINTCONFIG    ?= pclp_config.py
 SPLINT          ?= splint