COIN-OR::LEMON - Graph Library

Changeset 1050:78b9fb1f4454 in lemon


Ignore:
Timestamp:
03/17/11 18:12:03 (8 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1049:a07b6b27fe69 (diff), 1044: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:
2 edited

Legend:

Unmodified
Added
Removed
  • test/CMakeLists.txt

    r1044 r1050  
    1414SET(TESTS
    1515  adaptors_test
     16  bellman_ford_test
    1617  bfs_test
    1718  circulation_test
     
    2526  error_test
    2627  euler_test
     28  fractional_matching_test
    2729  gomory_hu_test
    2830  graph_copy_test
     
    3436  maps_test
    3537  matching_test
     38  max_cardinality_search_test
     39  max_clique_test
    3640  min_cost_arborescence_test
    3741  min_cost_flow_test
     42  min_mean_cycle_test
     43  nagamochi_ibaraki_test
    3844  path_test
     45  planarity_test
    3946  preflow_test
    4047  radix_sort_test
  • test/CMakeLists.txt

    r1040 r1050  
    77  ${PROJECT_BINARY_DIR}/lemon
    88)
     9
     10SET(TEST_WITH_VALGRIND "NO" CACHE STRING
     11  "Run the test with valgrind (YES/NO).")
     12SET(VALGRIND_FLAGS "" CACHE STRING "Valgrind flags used by the tests.")
    913
    1014SET(TESTS
     
    137141  ENDIF()
    138142  TARGET_LINK_LIBRARIES(${TEST_NAME} lemon)
    139   ADD_TEST(${TEST_NAME} ${TEST_NAME})
     143    IF(TEST_WITH_VALGRIND)
     144      ADD_TEST(${TEST_NAME}
     145        valgrind --error-exitcode=1 ${VALGRIND_FLAGS}
     146        ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME} )
     147    ELSE()
     148      ADD_TEST(${TEST_NAME} ${TEST_NAME})
     149    ENDIF()
    140150  ADD_DEPENDENCIES(check ${TEST_NAME})
    141151ENDFOREACH()
Note: See TracChangeset for help on using the changeset viewer.