[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/5563527bcc8d
changeset: 609:5563527bcc8d
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Fri Apr 10 07:29:00 2009 +0100
description:
	Merge

diffstat:

 test/lp_test.cc  |  5 -----
 test/mip_test.cc |  5 -----
 2 files changed, 0 insertions(+), 10 deletions(-)

diffs (32 lines):

diff --git a/test/lp_test.cc b/test/lp_test.cc
--- a/test/lp_test.cc
+++ b/test/lp_test.cc
@@ -395,12 +395,7 @@
     aTest(lp_cplex2);
     cloneTest<CplexLp>();
   } catch (CplexEnv::LicenseError& error) {
-#ifdef LEMON_FORCE_CPLEX_CHECK
     check(false, error.what());
-#else
-    std::cerr << error.what() << std::endl;
-    std::cerr << "Cplex license check failed, lp check skipped" << std::endl;
-#endif
   }
 #endif
 
diff --git a/test/mip_test.cc b/test/mip_test.cc
--- a/test/mip_test.cc
+++ b/test/mip_test.cc
@@ -143,12 +143,7 @@
     aTest(mip2);
     cloneTest<CplexMip>();
   } catch (CplexEnv::LicenseError& error) {
-#ifdef LEMON_FORCE_CPLEX_CHECK
     check(false, error.what());
-#else
-    std::cerr << error.what() << std::endl;
-    std::cerr << "Cplex license check failed, lp check skipped" << std::endl;
-#endif
   }
 #endif