diff -r bdb873367c4c -r 68eaa3e9029d test/Makefile.am --- a/test/Makefile.am Tue Jul 04 10:21:38 2006 +0000 +++ b/test/Makefile.am Tue Jul 04 11:58:39 2006 +0000 @@ -1,87 +1,87 @@ -#EXTRA_DIST += \ -# test/preflow_graph.dim \ -# test/dijkstra_test.lgf +##EXTRA_DIST += +## test/preflow_graph.dim \ +## test/dijkstra_test.lgf -#noinst_HEADERS += \ -# test/test_tools.h \ -# test/graph_test.h \ -# test/map_test.h \ -# test/graph_utils_test.h \ -# test/heap_test.h +noinst_HEADERS += +## test/test_tools.h \ +## test/graph_test.h \ +## test/map_test.h \ +## test/graph_utils_test.h \ +## test/heap_test.h -#check_PROGRAMS += \ -# test/all_pairs_shortest_path_test \ -# test/arborescence_test \ -# test/bfs_test \ -# test/bipartite_matching_test \ -# test/counter_test \ -# test/dfs_test \ -# test/dijkstra_test \ -# test/edge_set_test \ -# test/graph_adaptor_test \ -# test/graph_test \ -# test/graph_utils_test \ -# test/heap_test \ -# test/kruskal_test \ -# test/maps_test \ -# test/matrix_maps_test \ -# test/max_matching_test \ -# test/min_cost_flow_test \ -# test/path_test \ -# test/polynomial_test \ -# test/preflow_test \ -# test/radix_sort_test \ -# test/refptr_test \ -# test/simann_test \ -# test/suurballe_test \ -# test/test_tools_fail \ -# test/test_tools_pass \ -# test/time_measure_test \ -# test/ugraph_test \ -# test/unionfind_test \ -# test/xy_test +check_PROGRAMS += +## test/all_pairs_shortest_path_test \ +## test/arborescence_test \ +## test/bfs_test \ +## test/bipartite_matching_test \ +## test/counter_test \ +## test/dfs_test \ +## test/dijkstra_test \ +## test/edge_set_test \ +## test/graph_adaptor_test \ +## test/graph_test \ +## test/graph_utils_test \ +## test/heap_test \ +## test/kruskal_test \ +## test/maps_test \ +## test/matrix_maps_test \ +## test/max_matching_test \ +## test/min_cost_flow_test \ +## test/path_test \ +## test/polynomial_test \ +## test/preflow_test \ +## test/radix_sort_test \ +## test/refptr_test \ +## test/simann_test \ +## test/suurballe_test \ +## test/test_tools_fail \ +## test/test_tools_pass \ +## test/time_measure_test \ +## test/ugraph_test \ +## test/unionfind_test \ +## test/xy_test if HAVE_GLPK -#check_PROGRAMS += test/lp_test +##check_PROGRAMS += test/lp_test else !HAVE_GLPK if HAVE_CPLEX -#check_PROGRAMS += test/lp_test +##check_PROGRAMS += test/lp_test endif HAVE_CPLEX endif !HAVE_GLPK TESTS += $(check_PROGRAMS) XFAIL_TESTS += test/test_tools_fail$(EXEEXT) -#test_all_pairs_shortest_path_test_SOURCES = test/all_pairs_shortest_path_test.cc -#test_arborescence_test_SOURCES = test/arborescence_test.cc -#test_bfs_test_SOURCES = test/bfs_test.cc -#test_bipartite_matching_test_SOURCES = test/bipartite_matching_test.cc -#test_counter_test_SOURCES = test/counter_test.cc -#test_dfs_test_SOURCES = test/dfs_test.cc -#test_dijkstra_test_SOURCES = test/dijkstra_test.cc -#test_edge_set_test_SOURCES = test/edge_set_test.cc -#test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc -#test_graph_test_SOURCES = test/graph_test.cc -#test_graph_utils_test_SOURCES = test/graph_utils_test.cc -#test_heap_test_SOURCES = test/heap_test.cc -#test_kruskal_test_SOURCES = test/kruskal_test.cc -#test_maps_test_SOURCES = test/maps_test.cc -#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_path_test_SOURCES = test/path_test.cc -#test_polynomial_test_SOURCES = test/polynomial_test.cc -#test_preflow_test_SOURCES = test/preflow_test.cc -#test_radix_sort_test_SOURCES = test/radix_sort_test.cc -#test_refptr_test_SOURCES = test/refptr_test.cc -#test_simann_test_SOURCES = test/simann_test.cc -#test_suurballe_test_SOURCES = test/suurballe_test.cc -#test_test_tools_fail_SOURCES = test/test_tools_fail.cc -#test_test_tools_pass_SOURCES = test/test_tools_pass.cc -#test_time_measure_test_SOURCES = test/time_measure_test.cc -#test_ugraph_test_SOURCES = test/ugraph_test.cc -#test_unionfind_test_SOURCES = test/unionfind_test.cc -#test_xy_test_SOURCES = test/xy_test.cc +##test_all_pairs_shortest_path_test_SOURCES = test/all_pairs_shortest_path_test.cc +##test_arborescence_test_SOURCES = test/arborescence_test.cc +##test_bfs_test_SOURCES = test/bfs_test.cc +##test_bipartite_matching_test_SOURCES = test/bipartite_matching_test.cc +##test_counter_test_SOURCES = test/counter_test.cc +##test_dfs_test_SOURCES = test/dfs_test.cc +##test_dijkstra_test_SOURCES = test/dijkstra_test.cc +##test_edge_set_test_SOURCES = test/edge_set_test.cc +##test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc +##test_graph_test_SOURCES = test/graph_test.cc +##test_graph_utils_test_SOURCES = test/graph_utils_test.cc +##test_heap_test_SOURCES = test/heap_test.cc +##test_kruskal_test_SOURCES = test/kruskal_test.cc +##test_maps_test_SOURCES = test/maps_test.cc +##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_path_test_SOURCES = test/path_test.cc +##test_polynomial_test_SOURCES = test/polynomial_test.cc +##test_preflow_test_SOURCES = test/preflow_test.cc +##test_radix_sort_test_SOURCES = test/radix_sort_test.cc +##test_refptr_test_SOURCES = test/refptr_test.cc +##test_simann_test_SOURCES = test/simann_test.cc +##test_suurballe_test_SOURCES = test/suurballe_test.cc +##test_test_tools_fail_SOURCES = test/test_tools_fail.cc +##test_test_tools_pass_SOURCES = test/test_tools_pass.cc +##test_time_measure_test_SOURCES = test/time_measure_test.cc +##test_ugraph_test_SOURCES = test/ugraph_test.cc +##test_unionfind_test_SOURCES = test/unionfind_test.cc +##test_xy_test_SOURCES = test/xy_test.cc -#test_lp_test_SOURCES = test/lp_test.cc -#test_lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) +##test_lp_test_SOURCES = test/lp_test.cc +##test_lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)