Changeset 942:2b6bffe0e7e8 in lemon-1.2 for test/Makefile.am

Timestamp:

12/20/11 18:15:14 (13 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

941:7c4ba7daaf5f (diff), 915:633956ca9421 (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

Files:

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

test/Makefile.am

@@ -32 +32 @@
         test/heap_test \
         test/kruskal_test \
+        test/lgf_test \
         test/maps_test \
         test/matching_test \
@@ -81 +82 @@
 test_kruskal_test_SOURCES = test/kruskal_test.cc
 test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
+test_lgf_test_SOURCES = test/lgf_test.cc
 test_lp_test_SOURCES = test/lp_test.cc
 test_maps_test_SOURCES = test/maps_test.cc

test/Makefile.am

@@ +1 @@
+if USE_VALGRIND
+TESTS_ENVIRONMENT=$(top_srcdir)/scripts/valgrind-wrapper.sh
+endif
+
 EXTRA_DIST += \
         test/CMakeLists.txt
@@ -8 +12 @@
 check_PROGRAMS += \
         test/adaptors_test \
+        test/bellman_ford_test \
         test/bfs_test \
         test/circulation_test \
@@ -19 +24 @@
         test/error_test \
         test/euler_test \
+        test/fractional_matching_test \
         test/gomory_hu_test \
         test/graph_copy_test \
@@ -31 +37 @@
         test/min_cost_arborescence_test \
         test/min_cost_flow_test \
+        test/min_mean_cycle_test \
         test/path_test \
+        test/planarity_test \
         test/preflow_test \
         test/radix_sort_test \
@@ -54 +62 @@
 
 test_adaptors_test_SOURCES = test/adaptors_test.cc
+test_bellman_ford_test_SOURCES = test/bellman_ford_test.cc
 test_bfs_test_SOURCES = test/bfs_test.cc
 test_circulation_test_SOURCES = test/circulation_test.cc
@@ -65 +74 @@
 test_error_test_SOURCES = test/error_test.cc
 test_euler_test_SOURCES = test/euler_test.cc
+test_fractional_matching_test_SOURCES = test/fractional_matching_test.cc
 test_gomory_hu_test_SOURCES = test/gomory_hu_test.cc
 test_graph_copy_test_SOURCES = test/graph_copy_test.cc
@@ -79 +89 @@
 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_min_mean_cycle_test_SOURCES = test/min_mean_cycle_test.cc
 test_path_test_SOURCES = test/path_test.cc
+test_planarity_test_SOURCES = test/planarity_test.cc
 test_preflow_test_SOURCES = test/preflow_test.cc
 test_radix_sort_test_SOURCES = test/radix_sort_test.cc