equal
deleted
inserted
replaced
47 if HAVE_GLPK |
47 if HAVE_GLPK |
48 check_PROGRAMS += test/lp_test test/mip_test |
48 check_PROGRAMS += test/lp_test test/mip_test |
49 else !HAVE_GLPK |
49 else !HAVE_GLPK |
50 if HAVE_CPLEX |
50 if HAVE_CPLEX |
51 check_PROGRAMS += test/lp_test test/mip_test |
51 check_PROGRAMS += test/lp_test test/mip_test |
52 endif HAVE_CPLEX |
52 else !HAVE_CPLEX |
|
53 if HAVE_SOPLEX |
|
54 check_PROGRAMS += test/lp_test |
|
55 endif HAVE_SOPLEX |
|
56 endif !HAVE_CPLEX |
53 endif !HAVE_GLPK |
57 endif !HAVE_GLPK |
54 |
58 |
55 TESTS += $(check_PROGRAMS) |
59 TESTS += $(check_PROGRAMS) |
56 XFAIL_TESTS += test/test_tools_fail$(EXEEXT) |
60 XFAIL_TESTS += test/test_tools_fail$(EXEEXT) |
57 |
61 |
87 test_time_measure_test_SOURCES = test/time_measure_test.cc |
91 test_time_measure_test_SOURCES = test/time_measure_test.cc |
88 test_ugraph_test_SOURCES = test/ugraph_test.cc |
92 test_ugraph_test_SOURCES = test/ugraph_test.cc |
89 test_unionfind_test_SOURCES = test/unionfind_test.cc |
93 test_unionfind_test_SOURCES = test/unionfind_test.cc |
90 |
94 |
91 test_lp_test_SOURCES = test/lp_test.cc |
95 test_lp_test_SOURCES = test/lp_test.cc |
92 test_lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) |
96 test_lp_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) |
93 test_mip_test_SOURCES = test/mip_test.cc |
97 test_mip_test_SOURCES = test/mip_test.cc |
94 test_mip_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) |
98 test_mip_test_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) |