Changeset 939:78b9fb1f4454 in lemon-main

Timestamp:

03/17/11 18:12:03 (14 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

938:a07b6b27fe69 (diff), 933:66156a3498ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge #416

Files:

• test/CMakeLists.txt (modified) (3 diffs)
• test/CMakeLists.txt (modified) (2 diffs)

test/CMakeLists.txt

@@ -14 +14 @@
 SET(TESTS
   adaptors_test
+  bellman_ford_test
   bfs_test
   circulation_test
@@ -25 +26 @@
   error_test
   euler_test
+  fractional_matching_test
   gomory_hu_test
   graph_copy_test
@@ -34 +36 @@
   maps_test
   matching_test
+  max_cardinality_search_test
+  max_clique_test
   min_cost_arborescence_test
   min_cost_flow_test
+  min_mean_cycle_test
+  nagamochi_ibaraki_test
   path_test
+  planarity_test
   preflow_test
   radix_sort_test

test/CMakeLists.txt

@@ -7 +7 @@
   ${PROJECT_BINARY_DIR}/lemon
 )
+
+SET(TEST_WITH_VALGRIND "NO" CACHE STRING
+  "Run the test with valgrind (YES/NO).")
+SET(VALGRIND_FLAGS "" CACHE STRING "Valgrind flags used by the tests.")
 
 SET(TESTS
@@ -137 +141 @@
   ENDIF()
   TARGET_LINK_LIBRARIES(${TEST_NAME} lemon)
-  ADD_TEST(${TEST_NAME} ${TEST_NAME})
+    IF(TEST_WITH_VALGRIND)
+      ADD_TEST(${TEST_NAME}
+        valgrind --error-exitcode=1 ${VALGRIND_FLAGS}
+        ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME} )
+    ELSE()
+      ADD_TEST(${TEST_NAME} ${TEST_NAME})
+    ENDIF()
   ADD_DEPENDENCIES(check ${TEST_NAME})
 ENDFOREACH()