# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 2009-04-10 08:29:00
# Node ID 5563527bcc8d4fbfb033de768daddc0bf125e360
# Parent  745e182d01397d0fda77e4f76d031b11d7ad63aa
# Parent  3cbddc293cf91e7977a608f66aeb64a643062d9c

Merge

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