1.1 --- a/test/Makefile.am Thu Jun 22 15:16:11 2006 +0000
1.2 +++ b/test/Makefile.am Thu Jun 22 18:20:25 2006 +0000
1.3 @@ -1,89 +1,87 @@
1.4 -AM_CPPFLAGS = -I$(top_srcdir) -fno-inline
1.5 -LDADD = $(top_builddir)/lemon/libemon.la
1.6 +EXTRA_DIST += \
1.7 + test/preflow_graph.dim \
1.8 + test/dijkstra_test.lgf
1.9
1.10 -EXTRA_DIST = preflow_graph.dim dijkstra_test.lgf
1.11 +noinst_HEADERS += \
1.12 + test/test_tools.h \
1.13 + test/graph_test.h \
1.14 + test/map_test.h \
1.15 + test/graph_utils_test.h \
1.16 + test/heap_test.h
1.17
1.18 -noinst_HEADERS = \
1.19 - test_tools.h \
1.20 - graph_test.h \
1.21 - map_test.h \
1.22 - graph_utils_test.h \
1.23 - heap_test.h
1.24 -
1.25 -
1.26 -check_PROGRAMS = \
1.27 - all_pairs_shortest_path_test \
1.28 - arborescence_test \
1.29 - bfs_test \
1.30 - bipartite_matching_test \
1.31 - counter_test \
1.32 - dfs_test \
1.33 - dijkstra_test \
1.34 - edge_set_test \
1.35 - graph_adaptor_test \
1.36 - graph_test \
1.37 - graph_utils_test \
1.38 - heap_test \
1.39 - kruskal_test \
1.40 - maps_test \
1.41 - matrix_maps_test \
1.42 - max_matching_test \
1.43 - min_cost_flow_test \
1.44 - path_test \
1.45 - polynomial_test \
1.46 - preflow_test \
1.47 - radix_sort_test \
1.48 - refptr_test \
1.49 - simann_test \
1.50 - suurballe_test \
1.51 - test_tools_fail \
1.52 - test_tools_pass \
1.53 - time_measure_test \
1.54 - ugraph_test \
1.55 - unionfind_test \
1.56 - xy_test
1.57 +check_PROGRAMS += \
1.58 + test/all_pairs_shortest_path_test \
1.59 + test/arborescence_test \
1.60 + test/bfs_test \
1.61 + test/bipartite_matching_test \
1.62 + test/counter_test \
1.63 + test/dfs_test \
1.64 + test/dijkstra_test \
1.65 + test/edge_set_test \
1.66 + test/graph_adaptor_test \
1.67 + test/graph_test \
1.68 + test/graph_utils_test \
1.69 + test/heap_test \
1.70 + test/kruskal_test \
1.71 + test/maps_test \
1.72 + test/matrix_maps_test \
1.73 + test/max_matching_test \
1.74 + test/min_cost_flow_test \
1.75 + test/path_test \
1.76 + test/polynomial_test \
1.77 + test/preflow_test \
1.78 + test/radix_sort_test \
1.79 + test/refptr_test \
1.80 + test/simann_test \
1.81 + test/suurballe_test \
1.82 + test/test_tools_fail \
1.83 + test/test_tools_pass \
1.84 + test/time_measure_test \
1.85 + test/ugraph_test \
1.86 + test/unionfind_test \
1.87 + test/xy_test
1.88
1.89 if HAVE_GLPK
1.90 -check_PROGRAMS += lp_test
1.91 +check_PROGRAMS += test/lp_test
1.92 else !HAVE_GLPK
1.93 if HAVE_CPLEX
1.94 -check_PROGRAMS += lp_test
1.95 +check_PROGRAMS += test/lp_test
1.96 endif HAVE_CPLEX
1.97 endif !HAVE_GLPK
1.98
1.99 -TESTS = $(check_PROGRAMS)
1.100 -XFAIL_TESTS = test_tools_fail$(EXEEXT)
1.101 +TESTS += $(check_PROGRAMS)
1.102 +XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
1.103
1.104 -all_pairs_shortest_path_test_SOURCES = all_pairs_shortest_path_test.cc
1.105 -arborescence_test_SOURCES = arborescence_test.cc
1.106 -bfs_test_SOURCES = bfs_test.cc
1.107 -bipartite_matching_test_SOURCES = bipartite_matching_test.cc
1.108 -counter_test_SOURCES = counter_test.cc
1.109 -dfs_test_SOURCES = dfs_test.cc
1.110 -dijkstra_test_SOURCES = dijkstra_test.cc
1.111 -edge_set_test_SOURCES = edge_set_test.cc
1.112 -graph_adaptor_test_SOURCES = graph_adaptor_test.cc
1.113 -graph_test_SOURCES = graph_test.cc
1.114 -graph_utils_test_SOURCES = graph_utils_test.cc
1.115 -heap_test_SOURCES = heap_test.cc
1.116 -kruskal_test_SOURCES = kruskal_test.cc
1.117 -maps_test_SOURCES = maps_test.cc
1.118 -matrix_maps_test_SOURCES = matrix_maps_test.cc
1.119 -max_matching_test_SOURCES = max_matching_test.cc
1.120 -min_cost_flow_test_SOURCES = min_cost_flow_test.cc
1.121 -path_test_SOURCES = path_test.cc
1.122 -polynomial_test_SOURCES = polynomial_test.cc
1.123 -preflow_test_SOURCES = preflow_test.cc
1.124 -radix_sort_test_SOURCES = radix_sort_test.cc
1.125 -refptr_test_SOURCES = refptr_test.cc
1.126 -simann_test_SOURCES = simann_test.cc
1.127 -suurballe_test_SOURCES = suurballe_test.cc
1.128 -test_tools_fail_SOURCES = test_tools_fail.cc
1.129 -test_tools_pass_SOURCES = test_tools_pass.cc
1.130 -time_measure_test_SOURCES = time_measure_test.cc
1.131 -ugraph_test_SOURCES = ugraph_test.cc
1.132 -unionfind_test_SOURCES = unionfind_test.cc
1.133 -xy_test_SOURCES = xy_test.cc
1.134 +test_all_pairs_shortest_path_test_SOURCES = test/all_pairs_shortest_path_test.cc
1.135 +test_arborescence_test_SOURCES = test/arborescence_test.cc
1.136 +test_bfs_test_SOURCES = test/bfs_test.cc
1.137 +test_bipartite_matching_test_SOURCES = test/bipartite_matching_test.cc
1.138 +test_counter_test_SOURCES = test/counter_test.cc
1.139 +test_dfs_test_SOURCES = test/dfs_test.cc
1.140 +test_dijkstra_test_SOURCES = test/dijkstra_test.cc
1.141 +test_edge_set_test_SOURCES = test/edge_set_test.cc
1.142 +test_graph_adaptor_test_SOURCES = test/graph_adaptor_test.cc
1.143 +test_graph_test_SOURCES = test/graph_test.cc
1.144 +test_graph_utils_test_SOURCES = test/graph_utils_test.cc
1.145 +test_heap_test_SOURCES = test/heap_test.cc
1.146 +test_kruskal_test_SOURCES = test/kruskal_test.cc
1.147 +test_maps_test_SOURCES = test/maps_test.cc
1.148 +test_matrix_maps_test_SOURCES = test/matrix_maps_test.cc
1.149 +test_max_matching_test_SOURCES = test/max_matching_test.cc
1.150 +test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
1.151 +test_path_test_SOURCES = test/path_test.cc
1.152 +test_polynomial_test_SOURCES = test/polynomial_test.cc
1.153 +test_preflow_test_SOURCES = test/preflow_test.cc
1.154 +test_radix_sort_test_SOURCES = test/radix_sort_test.cc
1.155 +test_refptr_test_SOURCES = test/refptr_test.cc
1.156 +test_simann_test_SOURCES = test/simann_test.cc
1.157 +test_suurballe_test_SOURCES = test/suurballe_test.cc
1.158 +test_test_tools_fail_SOURCES = test/test_tools_fail.cc
1.159 +test_test_tools_pass_SOURCES = test/test_tools_pass.cc
1.160 +test_time_measure_test_SOURCES = test/time_measure_test.cc
1.161 +test_ugraph_test_SOURCES = test/ugraph_test.cc
1.162 +test_unionfind_test_SOURCES = test/unionfind_test.cc
1.163 +test_xy_test_SOURCES = test/xy_test.cc
1.164
1.165 -lp_test_SOURCES = lp_test.cc
1.166 -lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
1.167 +test_lp_test_SOURCES = test/lp_test.cc
1.168 +test_lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)