Changeset 528:88bd39ef7d98 in lemon-main for test

Timestamp:

02/23/09 13:26:21 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

527:c458e02723b1 (diff), 501:7f8560cb9d65 (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

Location:

test

Files:

• CMakeLists.txt (modified) (3 diffs)
• CMakeLists.txt (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)

test/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+INCLUDE_DIRECTORIES(
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+)
+
+IF(HAVE_GLPK)
+  INCLUDE_DIRECTORIES(${GLPK_INCLUDE_DIR})
+ENDIF(HAVE_GLPK)
 
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
 
 SET(TESTS
+  adaptors_test
   bfs_test
+  circulation_test
   counter_test
   dfs_test
@@ -10 +19 @@
   dijkstra_test
   dim_test
+  edge_set_test
   error_test
+  euler_test
   graph_copy_test
   graph_test
@@ -20 +31 @@
   max_matching_test
   min_cost_arborescence_test
+  path_test
+  preflow_test
+  radix_sort_test
   random_test
-  path_test
+  suurballe_test
   time_measure_test
   unionfind_test)
+
+IF(HAVE_LP)
+  ADD_EXECUTABLE(lp_test lp_test.cc)
+  IF(HAVE_GLPK)
+    TARGET_LINK_LIBRARIES(lp_test lemon ${GLPK_LIBRARIES})
+  ENDIF(HAVE_GLPK)
+  ADD_TEST(lp_test lp_test)
+
+  IF(WIN32 AND HAVE_GLPK)
+    GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION)
+    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
+    ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD
+      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
+      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
+      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
+    )
+  ENDIF(WIN32 AND HAVE_GLPK)
+ENDIF(HAVE_LP)
+
+IF(HAVE_MIP)
+  ADD_EXECUTABLE(mip_test mip_test.cc)
+  IF(HAVE_GLPK)
+    TARGET_LINK_LIBRARIES(mip_test lemon ${GLPK_LIBRARIES})
+  ENDIF(HAVE_GLPK)
+  ADD_TEST(mip_test mip_test)
+
+  IF(WIN32 AND HAVE_GLPK)
+    GET_TARGET_PROPERTY(TARGET_LOC mip_test LOCATION)
+    GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH)
+    ADD_CUSTOM_COMMAND(TARGET mip_test POST_BUILD
+      COMMAND cmake -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH}
+      COMMAND cmake -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH}
+      COMMAND cmake -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH}
+    )
+  ENDIF(WIN32 AND HAVE_GLPK)
+ENDIF(HAVE_MIP)
 
 FOREACH(TEST_NAME ${TESTS})

test/CMakeLists.txt

@@ -30 +30 @@
   maps_test
   max_matching_test
+  min_cost_arborescence_test
   path_test
   preflow_test

test/Makefile.am

@@ -1 +1 @@
 EXTRA_DIST += \
-        test/CMakeLists.txt \
-        test/min_cost_flow_test.lgf \
-        test/preflow_graph.lgf
+        test/CMakeLists.txt
 
 noinst_HEADERS += \
         test/graph_test.h \
-        test/test_tools.h
+        test/test_tools.h
 
 check_PROGRAMS += \
+        test/adaptors_test \
         test/bfs_test \
-        test/circulation_test \
-        test/counter_test \
+        test/circulation_test \
+        test/counter_test \
         test/dfs_test \
         test/digraph_test \
         test/dijkstra_test \
-        test/dim_test \
+        test/dim_test \
+        test/edge_set_test \
         test/error_test \
-        test/graph_adaptor_test \
+        test/euler_test \
         test/graph_copy_test \
         test/graph_test \
         test/graph_utils_test \
+        test/hao_orlin_test \
         test/heap_test \
         test/kruskal_test \
-        test/hao_orlin_test \
-        test/maps_test \
+        test/maps_test \
         test/max_matching_test \
         test/min_cost_arborescence_test \
-        test/random_test \
-        test/path_test \
-        test/preflow_test \
-        test/suurballe_test \
-        test/test_tools_fail \
-        test/test_tools_pass \
-        test/time_measure_test \
+        test/path_test \
+        test/preflow_test \
+        test/radix_sort_test \
+        test/random_test \
+        test/suurballe_test \
+        test/test_tools_fail \
+        test/test_tools_pass \
+        test/time_measure_test \
         test/unionfind_test
+
+if HAVE_LP
+check_PROGRAMS += test/lp_test
+endif HAVE_LP
+if HAVE_MIP
+check_PROGRAMS += test/mip_test
+endif HAVE_MIP
 
 TESTS += $(check_PROGRAMS)
 XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
 
+test_adaptors_test_SOURCES = test/adaptors_test.cc
 test_bfs_test_SOURCES = test/bfs_test.cc
 test_circulation_test_SOURCES = test/circulation_test.cc
@@ -46 +55 @@
 test_dijkstra_test_SOURCES = test/dijkstra_test.cc
 test_dim_test_SOURCES = test/dim_test.cc
+test_edge_set_test_SOURCES = test/edge_set_test.cc
 test_error_test_SOURCES = test/error_test.cc
-test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc
+test_euler_test_SOURCES = test/euler_test.cc
 test_graph_copy_test_SOURCES = test/graph_copy_test.cc
 test_graph_test_SOURCES = test/graph_test.cc
@@ -54 +64 @@
 test_kruskal_test_SOURCES = test/kruskal_test.cc
 test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
+test_lp_test_SOURCES = test/lp_test.cc
 test_maps_test_SOURCES = test/maps_test.cc
+test_mip_test_SOURCES = test/mip_test.cc
 test_max_matching_test_SOURCES = test/max_matching_test.cc
 test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
 test_path_test_SOURCES = test/path_test.cc
 test_preflow_test_SOURCES = test/preflow_test.cc
+test_radix_sort_test_SOURCES = test/radix_sort_test.cc
 test_suurballe_test_SOURCES = test/suurballe_test.cc
 test_random_test_SOURCES = test/random_test.cc

test/Makefile.am

@@ -26 +26 @@
         test/maps_test \
         test/max_matching_test \
+        test/min_cost_arborescence_test \
         test/path_test \
         test/preflow_test \
@@ -67 +68 @@
 test_mip_test_SOURCES = test/mip_test.cc
 test_max_matching_test_SOURCES = test/max_matching_test.cc
+test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
 test_path_test_SOURCES = test/path_test.cc
 test_preflow_test_SOURCES = test/preflow_test.cc