Changeset 611:85cb3aa71cce in lemon-1.2 for test/Makefile.am

Timestamp:

04/21/09 16:18:54 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

612:0c8e5c688440, 613:b1811c363299, 619:ec817dfc2cb7

Parents:

600:0ba8dfce7259 (diff), 610:dacc2cee2b4c (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 and fix

Files:

• test/Makefile.am (modified) (2 diffs)
• test/Makefile.am (modified) (5 diffs)

test/Makefile.am

@@ -28 +28 @@
         test/matching_test \
         test/min_cost_arborescence_test \
+        test/min_cost_flow_test \
         test/path_test \
         test/preflow_test \
@@ -73 +74 @@
 test_matching_test_SOURCES = test/matching_test.cc
 test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
+test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
 test_path_test_SOURCES = test/path_test.cc
 test_preflow_test_SOURCES = test/preflow_test.cc

test/Makefile.am

@@ -18 +18 @@
         test/error_test \
         test/euler_test \
+        test/gomory_hu_test \
         test/graph_copy_test \
         test/graph_test \
@@ -25 +26 @@
         test/kruskal_test \
         test/maps_test \
-        test/max_matching_test \
+        test/matching_test \
         test/min_cost_arborescence_test \
         test/min_cost_flow_test \
@@ -37 +38 @@
         test/time_measure_test \
         test/unionfind_test
+
+test_test_tools_pass_DEPENDENCIES = demo
 
 if HAVE_LP
@@ -59 +62 @@
 test_error_test_SOURCES = test/error_test.cc
 test_euler_test_SOURCES = test/euler_test.cc
+test_gomory_hu_test_SOURCES = test/gomory_hu_test.cc
 test_graph_copy_test_SOURCES = test/graph_copy_test.cc
 test_graph_test_SOURCES = test/graph_test.cc
@@ -68 +72 @@
 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_matching_test_SOURCES = test/matching_test.cc
 test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
 test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc