Merge branch '3460-VRP_unit_test_seems_incorrect' into 'v92-bugfix'

Added pass_regular_expression to CMakeLists.txt in examples/VRP/check

See merge request integer/scip!3828

Author: svigerske

applications/Coloring/check/CMakeLists.txt

@@ -40,6 +40,7 @@ foreach(instance ${instances})
     set_tests_properties("applications-coloring-${basename}"
                         PROPERTIES
                             PASS_REGULAR_EXPRESSION "Validation         : Success"
+                            FAIL_REGULAR_EXPRESSION "ERROR"
                             DEPENDS applications-coloring-build
                             RESOURCE_LOCK libscip
                         )

applications/CycleClustering/check/CMakeLists.txt

@@ -48,7 +48,8 @@ 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/MinIISC/check/CMakeLists.txt

@@ -42,6 +42,7 @@ foreach(instance ${instances})
     set_tests_properties("applications-miniisc-${basename}"
                         PROPERTIES
                             PASS_REGULAR_EXPRESSION "Primal Bound       : \\+(${optval}\\.000000*|${optvalminusone}\\.999999*)e\\+00"
+                            FAIL_REGULAR_EXPRESSION "ERROR"
                             DEPENDS applications-miniisc-build
                             RESOURCE_LOCK libscip
                         )

applications/Ringpacking/check/CMakeLists.txt

@@ -41,6 +41,7 @@ foreach(instance ${instances})
   set_tests_properties("applications-ringpacking-${basename}"
     PROPERTIES
     PASS_REGULAR_EXPRESSION "Validation         : Success"
+    FAIL_REGULAR_EXPRESSION "ERROR"
     DEPENDS applications-ringpacking-build
     RESOURCE_LOCK libscip
     )

applications/Scheduler/check/CMakeLists.txt

@@ -61,6 +61,7 @@ foreach(instance ${instances})
     set_tests_properties("applications-scheduler-${basename}"
                         PROPERTIES
                             PASS_REGULAR_EXPRESSION "Validation         : Success"
+                            FAIL_REGULAR_EXPRESSION "ERROR"
                             DEPENDS applications-scheduler-build
                             RESOURCE_LOCK libscip
                         )

examples/Binpacking/check/CMakeLists.txt

@@ -40,6 +40,7 @@ foreach(instance ${instances})
     set_tests_properties("examples-binpacking-${basename}"
                         PROPERTIES
                             PASS_REGULAR_EXPRESSION "Validation         : Success"
+                            FAIL_REGULAR_EXPRESSION "ERROR"
                             DEPENDS examples-binpacking-build
                             RESOURCE_LOCK libscip
                         )

examples/CallableLibrary/CMakeLists.txt

@@ -60,6 +60,7 @@ macro(addbuildandtest target)
             )
     set_tests_properties(examples-callablelibrary_${target}
                         PROPERTIES
+			    FAIL_REGULAR_EXPRESSION "ERROR"
                             DEPENDS examples-callablelibrary_${target}-build
                         )
     if(WIN32)

examples/Eventhdlr/CMakeLists.txt

@@ -77,6 +77,7 @@ foreach(instance ${instances})
     set_tests_properties(examples-eventhdlr-${basename}
                         PROPERTIES
                             PASS_REGULAR_EXPRESSION "Validation         : Success"
+                            FAIL_REGULAR_EXPRESSION "ERROR"
                             DEPENDS examples-eventhdlr-build
                             )
     if(WIN32)

examples/GMI/CMakeLists.txt

@@ -82,6 +82,7 @@ foreach(instance ${instances})
                 )
         set_tests_properties(examples-gmi-${setting}-${basename}
                             PROPERTIES
+                            FAIL_REGULAR_EXPRESSION "ERROR"
                                 DEPENDS examples-gmi-build
                             )
         if(WIN32)

examples/LOP/check/CMakeLists.txt

@@ -44,6 +44,7 @@ foreach(instance ${instances})
         set_tests_properties(examples-lop-${basename}
                             PROPERTIES
                                 PASS_REGULAR_EXPRESSION "Validation         : Success"
+                                FAIL_REGULAR_EXPRESSION "ERROR"
                                 DEPENDS examples-lop-build
                                 RESOURCE_LOCK libscip
                             )

examples/Queens/CMakeLists.txt

@@ -54,6 +54,7 @@ foreach(n ${nSet})
             )
     set_tests_properties(examples-queens-${n}
                         PROPERTIES
+			FAIL_REGULAR_EXPRESSION "ERROR"
                             DEPENDS examples-queens-build
                         )
     if(WIN32)

examples/Relaxator/check/CMakeLists.txt

@@ -46,8 +46,10 @@ foreach(instance ${instances})
                 )
         set_tests_properties(examples-relaxator-${basename}
                             PROPERTIES
-                                DEPENDS examples-relaxator-build
-                                RESOURCE_LOCK libscip
+                            PASS_REGULAR_EXPRESSION "Validation         : Success"
+                            FAIL_REGULAR_EXPRESSION "ERROR"
+                            DEPENDS examples-relaxator-build
+                            RESOURCE_LOCK libscip
                             )
         if(WIN32)
             # on windows we need to execute the application and examples executables from the directory containing the libscip.dll,

examples/SCFLP/check/CMakeLists.txt

@@ -43,6 +43,7 @@ foreach(instance ${instances})
     set_tests_properties("examples-scflp-${basename}"
                         PROPERTIES
                             PASS_REGULAR_EXPRESSION "Validation         : Success"
+                            FAIL_REGULAR_EXPRESSION "ERROR"
                             DEPENDS examples-scflp-build
                             RESOURCE_LOCK libscip
                         )

examples/TSP/check/CMakeLists.txt

@@ -43,6 +43,7 @@ foreach(instance ${instances})
     set_tests_properties(examples-tsp-${basename}
                         PROPERTIES
                             PASS_REGULAR_EXPRESSION "Validation         : Success"
+                            FAIL_REGULAR_EXPRESSION "ERROR"
                             DEPENDS examples-tsp-build
                             RESOURCE_LOCK libscip
                         )

examples/VRP/check/CMakeLists.txt

@@ -3,13 +3,14 @@ include(CTest)
 # define the instance sets
 #
 # semicolon '\;' is used to split an instance and its optimal objective value
+# and its optimal value minus one
 # For infeasible instances, '+infinity' is used (or '-infinity' in case of maximization)
 #
 set(instances
-    "eil13\;247"
-#    "eil22\;375"
+    "eil13\;2.47\;2.46"
+#    "eil22\;3.75\;3.74"
 #    this instance takes too long
-    "eil7\;104"
+    "eil7\;1.04\;1.03"
 )
 
 #
@@ -31,15 +32,18 @@ set_tests_properties(examples-vrp-build
 #
 foreach(instance ${instances})
     #
-    # treat the instance as a tuple (list) of two values
+    # treat the instance as a tuple (list) of three values
     #
     list(GET instance 0 basename)
     list(GET instance 1 optval)
-    add_test(NAME examples-vrp-${basename}
+    list(GET instance 2 optvalminusone)
+    add_test(NAME "examples-vrp-${basename}"
             COMMAND $<TARGET_FILE:vrp> ${CMAKE_CURRENT_SOURCE_DIR}/../data/${basename}.vrp
             )
-    set_tests_properties(examples-vrp-${basename}
+    set_tests_properties("examples-vrp-${basename}"
                         PROPERTIES
+                            PASS_REGULAR_EXPRESSION "Primal Bound       : \\+(${optval}000000*|${optvalminusone}999999*)e\\+02"
+                            FAIL_REGULAR_EXPRESSION "ERROR"
                             DEPENDS examples-vrp-build
                             RESOURCE_LOCK libscip
                             )