# HG changeset patch # User alpar # Date 1157531812 0 # Node ID 921923afd57ae62ffe88c4317e37ab221ee4458d # Parent 09af6d2b683b2b5b4b084b91b0f200005a4f82b4 Disable mip_test when no LP solver is available. diff -r 09af6d2b683b -r 921923afd57a test/Makefile.am --- a/test/Makefile.am Mon Sep 04 20:07:37 2006 +0000 +++ b/test/Makefile.am Wed Sep 06 08:36:52 2006 +0000 @@ -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