Changeset 469:04c0631fd332 in lemon-main for test

Timestamp:

01/12/09 14:37:37 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

470:81627fa1b007, 515:c35afa9e89e7

Parents:

467:a1155a9e8e09 (diff), 468:68fe66e2b34a (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) (1 diff)
• CMakeLists.txt (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• Makefile.am (modified) (3 diffs)

test/CMakeLists.txt

@@ -13 +13 @@
   dim_test
   error_test
+  edge_set_test
   graph_copy_test
   graph_test

test/CMakeLists.txt

@@ -4 +4 @@
 
 SET(TESTS
+  adaptors_test
   bfs_test
+  circulation_test
   counter_test
   dfs_test
@@ -18 +20 @@
   heap_test
   kruskal_test
+  lp_test
+  mip_test
   maps_test
   max_matching_test
+  radix_sort_test
+  path_test
+  preflow_test
   random_test
-  path_test
+  suurballe_test
   time_measure_test
   unionfind_test)

test/Makefile.am

@@ -15 +15 @@
         test/dijkstra_test \
         test/dim_test \
+        test/edge_set_test \
         test/error_test \
         test/graph_copy_test \
@@ -52 +53 @@
 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_copy_test_SOURCES = test/graph_copy_test.cc

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/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/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
@@ -48 +55 @@
 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_graph_copy_test_SOURCES = test/graph_copy_test.cc
 test_graph_test_SOURCES = test/graph_test.cc
@@ -55 +61 @@
 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_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