[Lemon-commits] [lemon_svn] alpar: r2922 - hugo/trunk/test

[Lemon SVN]

Author: alpar
Date: Wed Sep  6 10:36:52 2006
New Revision: 2922

Modified:
   hugo/trunk/test/Makefile.am

Log:
Disable mip_test when no LP solver is available.


Modified: hugo/trunk/test/Makefile.am
==============================================================================
--- hugo/trunk/test/Makefile.am	(original)
+++ hugo/trunk/test/Makefile.am	Wed Sep  6 10:36:52 2006
@@ -28,7 +28,6 @@
 	test/matrix_maps_test \
 	test/max_matching_test \
 	test/min_cost_flow_test \
-	test/mip_test \
 	test/path_test \
 	test/polynomial_test \
 	test/preflow_test \
@@ -44,10 +43,10 @@
 	test/xy_test
 
 if HAVE_GLPK
-check_PROGRAMS += test/lp_test
+check_PROGRAMS += test/lp_test test/mip_test
 else !HAVE_GLPK
 if HAVE_CPLEX
-check_PROGRAMS += test/lp_test
+check_PROGRAMS += test/lp_test test/mip_test
 endif HAVE_CPLEX
 endif !HAVE_GLPK
 
@@ -71,7 +70,6 @@
 test_matrix_maps_test_SOURCES = test/matrix_maps_test.cc
 test_max_matching_test_SOURCES = test/max_matching_test.cc
 test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
-test_mip_test_SOURCES = test/mip_test.cc
 test_path_test_SOURCES = test/path_test.cc
 test_polynomial_test_SOURCES = test/polynomial_test.cc
 test_preflow_test_SOURCES = test/preflow_test.cc
@@ -88,3 +86,5 @@
 
 test_lp_test_SOURCES = test/lp_test.cc
 test_lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
+test_mip_test_SOURCES = test/mip_test.cc
+test_mip_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
\ No newline at end of file