Mailinglist Archive: zypp-commit (348 mails)

[schubi2@xxxxxxxxxxxxxxxx]

Author: schubi2
Date: Thu Mar  6 13:16:53 2008
New Revision: 9029

URL: http://svn.opensuse.org/viewcvs/zypp?rev=9029&view=rev
Log:
generating pool if requested only

Modified:
    trunk/libzypp-testsuite/solver/src/deptestomatic.cc

Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/deptestomatic.cc?rev=9029&r1=9028&r2=9029&view=diff
==============================================================================
--- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original)
+++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Thu Mar  6 13:16:53 2008
@@ -1120,7 +1120,7 @@
 
//---------------------------------------------------------------------------------------------------------------------
 
 static void
-parse_xml_test (XmlNode_Ptr node, ResPool & pool)
+parse_xml_test (XmlNode_Ptr node)
 {
     if (!node->equals("test")) {
        ZYPP_THROW (Exception("Node not 'test' in 
parse_xml_test():"+node->name()));
@@ -1133,6 +1133,7 @@
            if (node->equals( "setup" )) {
                parse_xml_setup( node );
            } else if (node->equals( "trial" )) {
+                ResPool pool = God->pool();
                parse_xml_trial( node, pool );
            } else {
                cerr << "Unknown tag '" << node->name() << "' in test" << endl;
@@ -1145,7 +1146,7 @@
 
 
 static void
-process_xml_test_file (const string & filename, ResPool & pool)
+process_xml_test_file (const string & filename)
 {
     xmlDocPtr xml_doc;
     XmlNode_Ptr root;
@@ -1160,7 +1161,7 @@
 
     DBG << "Parsing file '" << filename << "'" << endl;
 
-    parse_xml_test (root, pool);
+    parse_xml_test (root);
 
     xmlFreeDoc (xml_doc);
 }
@@ -1171,7 +1172,8 @@
 int
 main (int argc, char *argv[])
 {
-
+//    ZConfig::instance().setSystemArchitecture(Arch( "x86_64" ));
+    
     if (argc != 2) {
        cerr << "Usage: deptestomatic testfile.xml" << endl;
        exit (0);
@@ -1198,9 +1200,7 @@
     globalPath = globalPath.substr (0, globalPath.find_last_of ("/") +1);
 
     DBG << "init_libzypp() done" << endl;
-
-    ResPool  pool = God->pool();    
-    process_xml_test_file (string (argv[1]), pool);
+    process_xml_test_file (string (argv[1]));
 
     return 0;
 }

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx