Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Fri, 10 Apr 2009 07:29:00 +0100
changeset 5695563527bcc8d
parent 568 745e182d0139
parent 567 3cbddc293cf9
child 570 a2e6b1dd487e
Merge
     1.1 --- a/test/lp_test.cc	Wed Apr 08 22:49:28 2009 +0200
     1.2 +++ b/test/lp_test.cc	Fri Apr 10 07:29:00 2009 +0100
     1.3 @@ -395,12 +395,7 @@
     1.4      aTest(lp_cplex2);
     1.5      cloneTest<CplexLp>();
     1.6    } catch (CplexEnv::LicenseError& error) {
     1.7 -#ifdef LEMON_FORCE_CPLEX_CHECK
     1.8      check(false, error.what());
     1.9 -#else
    1.10 -    std::cerr << error.what() << std::endl;
    1.11 -    std::cerr << "Cplex license check failed, lp check skipped" << std::endl;
    1.12 -#endif
    1.13    }
    1.14  #endif
    1.15  
     2.1 --- a/test/mip_test.cc	Wed Apr 08 22:49:28 2009 +0200
     2.2 +++ b/test/mip_test.cc	Fri Apr 10 07:29:00 2009 +0100
     2.3 @@ -143,12 +143,7 @@
     2.4      aTest(mip2);
     2.5      cloneTest<CplexMip>();
     2.6    } catch (CplexEnv::LicenseError& error) {
     2.7 -#ifdef LEMON_FORCE_CPLEX_CHECK
     2.8      check(false, error.what());
     2.9 -#else
    2.10 -    std::cerr << error.what() << std::endl;
    2.11 -    std::cerr << "Cplex license check failed, lp check skipped" << std::endl;
    2.12 -#endif
    2.13    }
    2.14  #endif
    2.15