COIN-OR::LEMON - Graph Library

Changeset 1206:a2d142bb5d3c in lemon for test


Ignore:
Timestamp:
03/01/13 17:59:08 (7 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1198:4936be66d2f5 (diff), 1205:d3dcc49e6403 (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 #386

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • test/CMakeLists.txt

    r1198 r1206  
    5353  suurballe_test
    5454  time_measure_test
     55  tsp_test
    5556  unionfind_test
    5657)
  • test/CMakeLists.txt

    r1203 r1206  
    88)
    99
     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.")
     13
    1014SET(TESTS
    1115  adaptors_test
     16  arc_look_up_test
    1217  bellman_ford_test
    1318  bfs_test
     19  bpgraph_test
    1420  circulation_test
    1521  connectivity_test
     
    3036  heap_test
    3137  kruskal_test
     38  lgf_reader_writer_test
     39  lgf_test
    3240  maps_test
    3341  matching_test
     
    7078  TARGET_LINK_LIBRARIES(lp_test ${LP_TEST_LIBS})
    7179  ADD_TEST(lp_test lp_test)
     80  ADD_DEPENDENCIES(check lp_test)
    7281
    7382  IF(WIN32 AND LEMON_HAVE_GLPK)
     
    8594    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    8695    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
    87       COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
     96      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
    8897    )
    8998  ENDIF()
     
    111120  TARGET_LINK_LIBRARIES(mip_test ${MIP_TEST_LIBS})
    112121  ADD_TEST(mip_test mip_test)
     122  ADD_DEPENDENCIES(check mip_test)
    113123
    114124  IF(WIN32 AND LEMON_HAVE_GLPK)
     
    126136    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
    127137    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
    128       COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex91.dll ${TARGET_PATH}
     138      COMMAND ${CMAKE_COMMAND} -E copy ${CPLEX_BIN_DIR}/cplex.dll ${TARGET_PATH}
    129139    )
    130140  ENDIF()
     
    138148  ENDIF()
    139149  TARGET_LINK_LIBRARIES(${TEST_NAME} lemon)
    140   ADD_TEST(${TEST_NAME} ${TEST_NAME})
     150    IF(TEST_WITH_VALGRIND)
     151      ADD_TEST(${TEST_NAME}
     152        valgrind --error-exitcode=1 ${VALGRIND_FLAGS}
     153        ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME} )
     154    ELSE()
     155      ADD_TEST(${TEST_NAME} ${TEST_NAME})
     156    ENDIF()
    141157  ADD_DEPENDENCIES(check ${TEST_NAME})
    142158ENDFOREACH()
Note: See TracChangeset for help on using the changeset viewer.