Changeset 467:a1155a9e8e09 in lemon-main

Timestamp:

01/12/09 14:18:03 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

462:9b082b3fb33f (diff), 466:4f1431aeef42 (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) (2 diffs)
• CMakeLists.txt (modified) (1 diff)
• Makefile.am (modified) (4 diffs)
• Makefile.am (modified) (2 diffs)
• graph_adaptor_test.cc (deleted)

test/CMakeLists.txt

@@ -4 +4 @@
 
 SET(TESTS
+  adaptors_test
   bfs_test
   circulation_test
@@ -12 +13 @@
   dim_test
   error_test
-  graph_adaptor_test
   graph_copy_test
   graph_test

test/CMakeLists.txt

@@ -19 +19 @@
   heap_test
   kruskal_test
+  lp_test
+  mip_test
   maps_test
   max_matching_test

test/Makefile.am

@@ -7 +7 @@
 
 check_PROGRAMS += \
+        test/adaptors_test \
         test/bfs_test \
         test/circulation_test \
@@ -15 +16 @@
         test/dim_test \
         test/error_test \
-        test/graph_adaptor_test \
         test/graph_copy_test \
         test/graph_test \
@@ -44 +44 @@
 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
@@ -52 +53 @@
 test_dim_test_SOURCES = test/dim_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

test/Makefile.am

@@ -34 +34 @@
         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)
@@ -52 +59 @@
 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