Changeset 874:d8ea85825e02 in lemon-main for test

Timestamp:

03/16/10 21:27:35 (15 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

873:23da1b807280 (diff), 872:41d7ac528c3a (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 #314

Location:

test

Files:

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

test/CMakeLists.txt

@@ -34 +34 @@
   min_cost_arborescence_test
   min_cost_flow_test
+  min_mean_cycle_test
   path_test
+  planarity_test
   preflow_test
   radix_sort_test

test/CMakeLists.txt

@@ -22 +22 @@
   error_test
   euler_test
+  fractional_matching_test
   gomory_hu_test
   graph_copy_test

test/Makefile.am

@@ +1 @@
+if USE_VALGRIND
+TESTS_ENVIRONMENT=$(top_srcdir)/scripts/valgrind-wrapper.sh
+endif
+
 EXTRA_DIST += \
         test/CMakeLists.txt
@@ -32 +36 @@
         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 \
@@ -81 +87 @@
 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

test/Makefile.am

@@ -24 +24 @@
         test/error_test \
         test/euler_test \
+        test/fractional_matching_test \
         test/gomory_hu_test \
         test/graph_copy_test \
@@ -72 +73 @@
 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