take care about the forceResolve in the testcases

diff --git a/zypp/solver/detail/Testcase.cc b/zypp/solver/detail/Testcase.cc
index 42e02cbdcad032b10e344b6f480775e9cdd5cd88..58eac7d1ead911773a4add9d847fc2e3b8d5cdc8 100644 (file)
--- a/zypp/solver/detail/Testcase.cc
+++ b/zypp/solver/detail/Testcase.cc
@@ -378,7 +378,9 @@ bool Testcase::createTestcase(Resolver & resolver, bool dumpPool, bool runSolver
     HelixControl control (dumpPath + "/solver-test.xml",
                          repoTable,
                          ZConfig::instance().systemArchitecture(),
     HelixControl control (dumpPath + "/solver-test.xml",
                          repoTable,
                          ZConfig::instance().systemArchitecture(),

-                         pool.getRequestedLocales());
+                         pool.getRequestedLocales(),
+                         "solver-system.xml.gz",
+                         resolver.forceResolve());

 
     for (PoolItemList::const_iterator iter = items_to_install.begin(); iter != items_to_install.end(); iter++) {
        control.installResolvable (iter->resolvable(), iter->status());
 
     for (PoolItemList::const_iterator iter = items_to_install.begin(); iter != items_to_install.end(); iter++) {
        control.installResolvable (iter->resolvable(), iter->status());


@@ -432,7 +434,8 @@ HelixControl::HelixControl(const std::string & controlPath,
                           const RepositoryTable & repoTable,
                           const Arch & systemArchitecture,
                           const LocaleSet &languages,
                           const RepositoryTable & repoTable,
                           const Arch & systemArchitecture,
                           const LocaleSet &languages,

-                          const std::string & systemPath)
+                          const std::string & systemPath,
+                          const bool forceResolve)

     :dumpFile (controlPath)
 {
     file = new ofstream(controlPath.c_str());
     :dumpFile (controlPath)
 {
     file = new ofstream(controlPath.c_str());


@@ -468,6 +471,10 @@ HelixControl::HelixControl(const std::string & controlPath,
        *file << TAB << "<locale name=\"" <<  iter->code()
              << "\" />" << endl;
     }
        *file << TAB << "<locale name=\"" <<  iter->code()
              << "\" />" << endl;
     }

+    
+    if (forceResolve)
+       *file << TAB << "<forceResolve/>" << endl;
+    

     *file << "</setup>" << endl
          << "<trial>" << endl
          << "<showpool all=\"yes\"/>" << endl;
     *file << "</setup>" << endl
          << "<trial>" << endl
          << "<showpool all=\"yes\"/>" << endl;

diff --git a/zypp/solver/detail/Testcase.h b/zypp/solver/detail/Testcase.h
index 9ee42540d242081040dd94ff05828744622accff..8176c6446e7408ac481ab2235105434fd833a57f 100644 (file)
--- a/zypp/solver/detail/Testcase.h
+++ b/zypp/solver/detail/Testcase.h
@@ -103,7 +103,8 @@ class  HelixControl {
                  const RepositoryTable & sourceTable,
                  const Arch & systemArchitecture,
                  const LocaleSet &languages,             
                  const RepositoryTable & sourceTable,
                  const Arch & systemArchitecture,
                  const LocaleSet &languages,             

-                 const std::string & systemPath = "solver-system.xml.gz");
+                 const std::string & systemPath = "solver-system.xml.gz",
+                 const bool forceResolve = false);

     HelixControl ();    
     ~HelixControl ();
 
     HelixControl ();    
     ~HelixControl ();