February 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> master : Prevent ResStatus from overriding user locks. (bnc #475230)
by Michael Andres 26 Feb '09

26 Feb '09

ref: refs/heads/master commit acd1ababbc377aa674d80e7380c0c02fc5259ce1 Author: Michael Andres <ma(a)suse.de> Date: Thu Feb 26 01:15:31 2009 +0100 Prevent ResStatus from overriding user locks. (bnc #475230) --- zypp/ResStatus.h | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/zypp/ResStatus.h b/zypp/ResStatus.h index 8b3b405..e48bc8d 100644 --- a/zypp/ResStatus.h +++ b/zypp/ResStatus.h @@ -300,6 +300,9 @@ namespace zypp } } + bool isToBeUninstalledDueToObsolete () const + { return isToBeUninstalled() && fieldValueIs<TransactDetailField>( DUE_TO_OBSOLETE ); } + bool isToBeUninstalledDueToUpgrade() const { return isToBeUninstalled() && fieldValueIs<TransactDetailField>( DUE_TO_UPGRADE ); } @@ -366,9 +369,9 @@ namespace zypp } /** Apply a lock (prevent transaction). - * Currently by USER only, but who knows... Set LOCKED - * from KEEP_STATE to be shure all transaction details - * were reset properly. + * Currently by USER or APPL_HIGH only, but who knows... + * Set LOCKED from KEEP_STATE to be shure all transaction + * details were reset properly. */ bool setLock( bool toLock_r, TransactByValue causer_r ) { @@ -381,19 +384,23 @@ namespace zypp return true; } // Here: Lock status is to be changed: - if ( causer_r != USER && causer_r != APPL_HIGH) - return false; - // Setting no transact removes an existing lock, - // or brings this into KEEP_STATE, and we apply the lock. - if ( ! setTransact( false, causer_r ) ) + if ( causer_r != USER && causer_r != APPL_HIGH ) return false; if ( toLock_r ) { - fieldValueAssign<TransactField>( LOCKED ); - fieldValueAssign<TransactByField>( causer_r ); + // We're in unlocked state, which includes TRANSACT. + // Causer must be allowed to reset this. But from + // KEEP_STATE every causer is allowed to set the lock. + if ( ! setTransact( false, causer_r ) ) + return false; + fieldValueAssign<TransactField>( LOCKED ); + fieldValueAssign<TransactByField>( causer_r ); } else { - fieldValueAssign<TransactField>( KEEP_STATE ); - fieldValueAssign<TransactByField>( SOLVER ); // reset to lowest causer - // in order to distinguish from keep_state_by_user + // To leave Locked state it needs a superior causer. + if ( isGreaterThan<TransactByField>( causer_r ) ) + return false; + fieldValueAssign<TransactField>( KEEP_STATE ); + fieldValueAssign<TransactByField>( SOLVER ); // reset to lowest causer + // in order to distinguish from keep_state_by_user } return true; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : TestSetup: move common define to header file
by Michael Andres 26 Feb '09

26 Feb '09

ref: refs/heads/master commit 30cf523d38d6d3330112d0249a37ee37d71e3a1f Author: Michael Andres <ma(a)suse.de> Date: Wed Feb 25 22:38:38 2009 +0100 TestSetup: move common define to header file --- tests/lib/TestSetup.h | 2 ++ tests/parser/ProductFileReader_test.cc | 2 -- tests/sat/LookupAttr_test.cc | 2 -- tests/sat/WhatObsoletes_test.cc | 2 -- tests/sat/WhatProvides_test.cc | 2 -- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/lib/TestSetup.h b/tests/lib/TestSetup.h index d9cb50d..1200972 100644 --- a/tests/lib/TestSetup.h +++ b/tests/lib/TestSetup.h @@ -29,6 +29,8 @@ using namespace zypp; #define BOOST_CHECK_NE( L, R ) BOOST_CHECK( (L) != (R) ) #endif +#define LABELED(V) #V << ":\t" << V + enum TestSetupOptionBits { TSO_CLEANROOT = (1 << 0) diff --git a/tests/parser/ProductFileReader_test.cc b/tests/parser/ProductFileReader_test.cc index b050458..5cba770 100644 --- a/tests/parser/ProductFileReader_test.cc +++ b/tests/parser/ProductFileReader_test.cc @@ -1,8 +1,6 @@ #include "TestSetup.h" #include <zypp/parser/ProductFileReader.h> -#define LABELED(V) #V << ":\t" << V - //static TestSetup test( Arch_x86_64 ); // Must be the first test! diff --git a/tests/sat/LookupAttr_test.cc b/tests/sat/LookupAttr_test.cc index 29a6dfe..46a45a2 100644 --- a/tests/sat/LookupAttr_test.cc +++ b/tests/sat/LookupAttr_test.cc @@ -2,8 +2,6 @@ #include <zypp/sat/LookupAttr.h> #include <zypp/ResObjects.h> -#define LABELED(V) #V << ":\t" << V - static TestSetup test( "/tmp/x", Arch_x86_64 ); // Must be the first test! diff --git a/tests/sat/WhatObsoletes_test.cc b/tests/sat/WhatObsoletes_test.cc index c082d99..f9dff54 100644 --- a/tests/sat/WhatObsoletes_test.cc +++ b/tests/sat/WhatObsoletes_test.cc @@ -1,8 +1,6 @@ #include "TestSetup.h" #include <zypp/sat/WhatObsoletes.h> -#define LABELED(V) #V << ":\t" << V - namespace zypp { namespace sat diff --git a/tests/sat/WhatProvides_test.cc b/tests/sat/WhatProvides_test.cc index ccd50ab..090cfa5 100644 --- a/tests/sat/WhatProvides_test.cc +++ b/tests/sat/WhatProvides_test.cc @@ -1,7 +1,5 @@ #include "TestSetup.h" -#define LABELED(V) #V << ":\t" << V - BOOST_AUTO_TEST_CASE(WhatProvides) { TestSetup test( Arch_x86_64 ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-Code-11-Branch : ResStatus testcase sketch
by Michael Andres 26 Feb '09

26 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit 2afc040aae040547871428aee6d21fa06a71ef79 Author: Michael Andres <ma(a)suse.de> Date: Thu Feb 26 01:16:39 2009 +0100 ResStatus testcase sketch --- tests/zypp/ResStatus_test.cc | 141 ++++++++++++++++++++++++++++------------- 1 files changed, 96 insertions(+), 45 deletions(-) diff --git a/tests/zypp/ResStatus_test.cc b/tests/zypp/ResStatus_test.cc index 0aa6fae..5d74504 100644 --- a/tests/zypp/ResStatus_test.cc +++ b/tests/zypp/ResStatus_test.cc @@ -3,75 +3,126 @@ #define BOOST_TEST_MODULE ResStatus -BOOST_AUTO_TEST_CASE(ResStatus_default) +template<class _Tp, int N> +inline _Tp * begin( _Tp (& _array)[N] ) { return _array; } + +template<class _Tp, int N> +inline _Tp * end( _Tp (& _array)[N] ) { return _array + (sizeof(_array)/sizeof(_Tp)); } + +ResStatus::TransactByValue transactByValues[] = { + ResStatus::USER, ResStatus::APPL_HIGH, ResStatus::APPL_LOW, ResStatus::SOLVER +}; + +ResStatus::TransactValue transactValues[] = { + ResStatus::TRANSACT, ResStatus::KEEP_STATE, ResStatus::LOCKED +}; + +bool transactTo[] = { true, false }; + +BOOST_AUTO_TEST_CASE(Default) { -#if 0 { ResStatus s; BOOST_CHECK( s.isUninstalled() ); BOOST_CHECK_EQUAL( s.isInstalled(), ! s.isUninstalled() ); - BOOST_CHECK_EQUAL( s.getTransactValue(), KEEP_STATE ); - BOOST_CHECK_EQUAL( s.getTransactByValue(), SOLVER ); + BOOST_CHECK_EQUAL( s.getTransactValue(), ResStatus::KEEP_STATE ); + BOOST_CHECK_EQUAL( s.getTransactByValue(), ResStatus::SOLVER ); } { ResStatus s( true ); - BOOST_CHECK( s.Installed() ); + BOOST_CHECK( s.isInstalled() ); BOOST_CHECK_EQUAL( s.isInstalled(), ! s.isUninstalled() ); - BOOST_CHECK_EQUAL( s.getTransactValue(), KEEP_STATE ); - BOOST_CHECK_EQUAL( s.getTransactByValue(), SOLVER ); + BOOST_CHECK_EQUAL( s.getTransactValue(), ResStatus::KEEP_STATE ); + BOOST_CHECK_EQUAL( s.getTransactByValue(), ResStatus::SOLVER ); } -#endif } -#if 0 -// enum TransactValue -// { -// KEEP_STATE = bit::RangeValue<TransactField,0>::value, -// LOCKED = bit::RangeValue<TransactField,1>::value, // locked, must not transact -// TRANSACT = bit::RangeValue<TransactField,2>::value // transact according to state -// }; -// enum TransactByValue -// { -// SOLVER = bit::RangeValue<TransactByField,0>::value, -// APPL_LOW = bit::RangeValue<TransactByField,1>::value, -// APPL_HIGH = bit::RangeValue<TransactByField,2>::value, -// USER = bit::RangeValue<TransactByField,3>::value -// }; - -ResStatus doTestSet( TransactValue tv, TransactByValue tb ) -{ - ResStatus s; - s.setTransactValue( tv, tb ); - BOOST_CHECK_EQUAL( getTransactValue( s ), tv ); - BOOST_CHECK_EQUAL( getTransactByValue( s ), tb ); -} +// Status transition like setTransact, setLock, setSoftTransact +typedef bool (ResStatus::* Transition)( bool, ResStatus::TransactByValue ); +// Result evaluation +typedef void (* Evaluate)( ResStatus::TransactValue, ResStatus::TransactByValue, /* fromState, fromBy */ + bool, ResStatus::TransactByValue, /* toState, toBy */ + bool, ResStatus ); /* done, result */ -BOOST_AUTO_TEST_CASE(ResStatus) +void testTable( Transition transition, Evaluate evaluate ) { - std::vector<TransactValue> TVs; - TVs.push_back( KEEP_STATE ); - TVs.push_back( LOCKED ); - TVs.push_back( TRANSACT ); - - std::vector<TransactByValue> TBs; - TBs.push_back( SOLVER ); - TBs.push_back( APPL_LOW ); - TBs.push_back( APPL_HIGH ); - TBs.push_back( USER ); - - for_( tv, TVs.begin(), TVs end() ) + // Table: For each causer combination (fromBy -> toBy) invoke transition: + // + // bool ok = ResStatus(fromState,fromBy).transition( toState, toBy ) + // + // And evaluate the result. + // + for ( ResStatus::TransactByValue * fromBy = begin( transactByValues ); fromBy != end( transactByValues ); ++fromBy ) { - for_( tb, TBs.begin(), TBs end() ) + for ( ResStatus::TransactByValue * toBy = begin( transactByValues ); toBy != end( transactByValues ); ++toBy ) { - doTestSet + for ( ResStatus::TransactValue * fromState = begin( transactValues ); fromState != end( transactValues ); ++fromState ) + { + for ( bool * toState = begin( transactTo ); toState != end( transactTo ); ++toState ) + { + ResStatus from; + from.setTransactValue( *fromState, *fromBy ); // NEEDS FIX! + ResStatus result( from ); + bool done = (result.*transition)( *toState, *toBy ); + + evaluate( *fromState, *fromBy, *toState, *toBy, done, result ); + } + } } } +} +// Transitions succeeds always: +#define CHECK_DONE_ALWAYS BOOST_CHECK_EQUAL( done, true ) +// Transitions succeeds if same or higher TransactByValue: +#define CHECK_DONE_IFCAUSER BOOST_CHECK_EQUAL( done, *toBy >= *fromBy ) +void evaluateSetTransact( ResStatus::TransactValue fromState, ResStatus::TransactByValue fromBy, + bool toState, ResStatus::TransactByValue toBy, + bool done, ResStatus result ) +{ + ResStatus from; + from.setTransactValue( fromState, fromBy ); + MIL << from << " =setTransact("<<toState<<","<<toBy<<")=>\t" << done << ":" << result << endl; + switch ( fromState ) + { + case ResStatus::TRANSACT: + if ( toState ) + { + } + else + { + } + break; + case ResStatus::KEEP_STATE: + if ( toState ) + { + } + else + { + } + break; + case ResStatus::LOCKED: + if ( toState ) + { + } + else + { + } + break; + } +} + +#if 0 +BOOST_AUTO_TEST_CASE(transition) +{ + base::LogControl::TmpLineWriter shutUp( new log::FileLineWriter( "/home/ma/zypp/BUILD/libzypp/devel/devel.ma/LOGFILE" ) ); + MIL << endl; + testTable( &ResStatus::setTransact, &evaluateSetTransact ); } #endif -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-Code-11-Branch : changes
by Michael Andres 26 Feb '09

26 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit 42288415c5085211a9b1f3205de12c03b451021d Author: Michael Andres <ma(a)suse.de> Date: Thu Feb 26 01:15:44 2009 +0100 changes --- VERSION.cmake | 6 +++--- package/libzypp.changes | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index c5e22b9..af64fb1 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -50,9 +50,9 @@ # SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") -SET(LIBZYPP_MINOR "28") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_MINOR "29") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 5.28.2 (23) +# LAST RELEASED: 5.29.0 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index ba38293..196d761 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 26 01:08:50 CET 2009 - ma(a)km13.de + +- Prevent ResStatus from overriding user locks. (bnc #475230) +- version 5.29.0 (23) + +------------------------------------------------------------------- Sun Feb 22 15:11:25 CET 2009 - ma(a)suse.de - Never refresh repositories from CD/DVD, once they are created. (bnc #476429) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-Code-11-Branch : Prevent ResStatus from overriding user locks. (bnc #475230)
by Michael Andres 26 Feb '09

26 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit fabff5f1b4977b2b9db89ea042a32f762fb087ac Author: Michael Andres <ma(a)suse.de> Date: Thu Feb 26 01:15:31 2009 +0100 Prevent ResStatus from overriding user locks. (bnc #475230) --- zypp/ResStatus.h | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/zypp/ResStatus.h b/zypp/ResStatus.h index c0ff1ba..9b7465d 100644 --- a/zypp/ResStatus.h +++ b/zypp/ResStatus.h @@ -300,7 +300,7 @@ namespace zypp return false; } } - + bool isToBeUninstalledDueToObsolete () const { return isToBeUninstalled() && fieldValueIs<TransactDetailField>( DUE_TO_OBSOLETE ); } @@ -370,9 +370,9 @@ namespace zypp } /** Apply a lock (prevent transaction). - * Currently by USER only, but who knows... Set LOCKED - * from KEEP_STATE to be shure all transaction details - * were reset properly. + * Currently by USER or APPL_HIGH only, but who knows... + * Set LOCKED from KEEP_STATE to be shure all transaction + * details were reset properly. */ bool setLock( bool toLock_r, TransactByValue causer_r ) { @@ -385,19 +385,23 @@ namespace zypp return true; } // Here: Lock status is to be changed: - if ( causer_r != USER && causer_r != APPL_HIGH) - return false; - // Setting no transact removes an existing lock, - // or brings this into KEEP_STATE, and we apply the lock. - if ( ! setTransact( false, causer_r ) ) + if ( causer_r != USER && causer_r != APPL_HIGH ) return false; if ( toLock_r ) { - fieldValueAssign<TransactField>( LOCKED ); - fieldValueAssign<TransactByField>( causer_r ); + // We're in unlocked state, which includes TRANSACT. + // Causer must be allowed to reset this. But from + // KEEP_STATE every causer is allowed to set the lock. + if ( ! setTransact( false, causer_r ) ) + return false; + fieldValueAssign<TransactField>( LOCKED ); + fieldValueAssign<TransactByField>( causer_r ); } else { - fieldValueAssign<TransactField>( KEEP_STATE ); - fieldValueAssign<TransactByField>( SOLVER ); // reset to lowest causer - // in order to distinguish from keep_state_by_user + // To leave Locked state it needs a superior causer. + if ( isGreaterThan<TransactByField>( causer_r ) ) + return false; + fieldValueAssign<TransactField>( KEEP_STATE ); + fieldValueAssign<TransactByField>( SOLVER ); // reset to lowest causer + // in order to distinguish from keep_state_by_user } return true; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-Code-11-Branch : TestSetup: move common define to header file
by Michael Andres 25 Feb '09

25 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit 0afce7437178bbee09b5a94cbe060d0b05d4b9b8 Author: Michael Andres <ma(a)suse.de> Date: Wed Feb 25 22:38:38 2009 +0100 TestSetup: move common define to header file --- tests/lib/TestSetup.h | 2 ++ tests/parser/ProductFileReader_test.cc | 2 -- tests/sat/LookupAttr_test.cc | 2 -- tests/sat/WhatObsoletes_test.cc | 2 -- tests/sat/WhatProvides_test.cc | 2 -- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/lib/TestSetup.h b/tests/lib/TestSetup.h index d9cb50d..1200972 100644 --- a/tests/lib/TestSetup.h +++ b/tests/lib/TestSetup.h @@ -29,6 +29,8 @@ using namespace zypp; #define BOOST_CHECK_NE( L, R ) BOOST_CHECK( (L) != (R) ) #endif +#define LABELED(V) #V << ":\t" << V + enum TestSetupOptionBits { TSO_CLEANROOT = (1 << 0) diff --git a/tests/parser/ProductFileReader_test.cc b/tests/parser/ProductFileReader_test.cc index 6c7cd18..cab2ff2 100644 --- a/tests/parser/ProductFileReader_test.cc +++ b/tests/parser/ProductFileReader_test.cc @@ -1,8 +1,6 @@ #include "TestSetup.h" #include <zypp/parser/ProductFileReader.h> -#define LABELED(V) #V << ":\t" << V - //static TestSetup test( Arch_x86_64 ); // Must be the first test! diff --git a/tests/sat/LookupAttr_test.cc b/tests/sat/LookupAttr_test.cc index 29a6dfe..46a45a2 100644 --- a/tests/sat/LookupAttr_test.cc +++ b/tests/sat/LookupAttr_test.cc @@ -2,8 +2,6 @@ #include <zypp/sat/LookupAttr.h> #include <zypp/ResObjects.h> -#define LABELED(V) #V << ":\t" << V - static TestSetup test( "/tmp/x", Arch_x86_64 ); // Must be the first test! diff --git a/tests/sat/WhatObsoletes_test.cc b/tests/sat/WhatObsoletes_test.cc index c082d99..f9dff54 100644 --- a/tests/sat/WhatObsoletes_test.cc +++ b/tests/sat/WhatObsoletes_test.cc @@ -1,8 +1,6 @@ #include "TestSetup.h" #include <zypp/sat/WhatObsoletes.h> -#define LABELED(V) #V << ":\t" << V - namespace zypp { namespace sat diff --git a/tests/sat/WhatProvides_test.cc b/tests/sat/WhatProvides_test.cc index ccd50ab..090cfa5 100644 --- a/tests/sat/WhatProvides_test.cc +++ b/tests/sat/WhatProvides_test.cc @@ -1,7 +1,5 @@ #include "TestSetup.h" -#define LABELED(V) #V << ":\t" << V - BOOST_AUTO_TEST_CASE(WhatProvides) { TestSetup test( Arch_x86_64 ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : Ensure to test the built extension, not the installed one
by Klaus Kämpf 25 Feb '09

25 Feb '09

ref: refs/heads/master commit e3d88a48be54a936d301381a705f97fa0cc485f1 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Wed Feb 25 16:34:43 2009 +0100 Ensure to test the built extension, not the installed one --- bindings/ruby/tests/CMakeLists.txt | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bindings/ruby/tests/CMakeLists.txt b/bindings/ruby/tests/CMakeLists.txt index ec5c75e..b4846ec 100644 --- a/bindings/ruby/tests/CMakeLists.txt +++ b/bindings/ruby/tests/CMakeLists.txt @@ -4,21 +4,21 @@ ENABLE_TESTING() -ADD_TEST(bindings_ruby_loading ruby ${CMAKE_CURRENT_SOURCE_DIR}/loading.rb) -ADD_TEST(bindings_ruby_pool ruby ${CMAKE_CURRENT_SOURCE_DIR}/pool.rb) -ADD_TEST(bindings_ruby_repo ruby ${CMAKE_CURRENT_SOURCE_DIR}/repo.rb) -ADD_TEST(bindings_ruby_rpmdb ruby ${CMAKE_CURRENT_SOURCE_DIR}/rpmdb.rb) +ADD_TEST(bindings_ruby_loading ruby -C ${CMAKE_CURRENT_SOURCE_DIR} loading.rb) +ADD_TEST(bindings_ruby_pool ruby -C ${CMAKE_CURRENT_SOURCE_DIR} pool.rb) +ADD_TEST(bindings_ruby_repo ruby -C ${CMAKE_CURRENT_SOURCE_DIR} repo.rb) +ADD_TEST(bindings_ruby_rpmdb ruby -C ${CMAKE_CURRENT_SOURCE_DIR} rpmdb.rb) -ADD_TEST(bindings_ruby_solvable ruby ${CMAKE_CURRENT_SOURCE_DIR}/solvable.rb) -ADD_TEST(bindings_ruby_relation ruby ${CMAKE_CURRENT_SOURCE_DIR}/relation.rb) -ADD_TEST(bindings_ruby_repodata ruby ${CMAKE_CURRENT_SOURCE_DIR}/repodata.rb) +ADD_TEST(bindings_ruby_solvable ruby -C ${CMAKE_CURRENT_SOURCE_DIR} solvable.rb) +ADD_TEST(bindings_ruby_relation ruby -C ${CMAKE_CURRENT_SOURCE_DIR} relation.rb) +ADD_TEST(bindings_ruby_repodata ruby -C ${CMAKE_CURRENT_SOURCE_DIR} repodata.rb) -ADD_TEST(bindings_ruby_providers ruby ${CMAKE_CURRENT_SOURCE_DIR}/providers.rb) +ADD_TEST(bindings_ruby_providers ruby -C ${CMAKE_CURRENT_SOURCE_DIR} providers.rb) -ADD_TEST(bindings_ruby_transaction ruby ${CMAKE_CURRENT_SOURCE_DIR}/transaction.rb) -ADD_TEST(bindings_ruby_covenants ruby ${CMAKE_CURRENT_SOURCE_DIR}/covenants.rb) +ADD_TEST(bindings_ruby_transaction ruby -C ${CMAKE_CURRENT_SOURCE_DIR} transaction.rb) +ADD_TEST(bindings_ruby_covenants ruby -C ${CMAKE_CURRENT_SOURCE_DIR} covenants.rb) -ADD_TEST(bindings_ruby_solver ruby ${CMAKE_CURRENT_SOURCE_DIR}/solver.rb) -ADD_TEST(bindings_ruby_decisions ruby ${CMAKE_CURRENT_SOURCE_DIR}/decisions.rb) -#ADD_TEST(bindings_ruby_problems ruby ${CMAKE_CURRENT_SOURCE_DIR}/problems.rb) -ADD_TEST(bindings_ruby_solutions ruby ${CMAKE_CURRENT_SOURCE_DIR}/solutions.rb) +ADD_TEST(bindings_ruby_solver ruby -C ${CMAKE_CURRENT_SOURCE_DIR} solver.rb) +ADD_TEST(bindings_ruby_decisions ruby -C ${CMAKE_CURRENT_SOURCE_DIR} decisions.rb) +#ADD_TEST(bindings_ruby_problems ruby -C ${CMAKE_CURRENT_SOURCE_DIR} problems.rb) +ADD_TEST(bindings_ruby_solutions ruby -C ${CMAKE_CURRENT_SOURCE_DIR} solutions.rb) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : Fix retrieval of numeric and constantid attributes
by Klaus Kämpf 25 Feb '09

25 Feb '09

ref: refs/heads/master commit afca6eab0ac27027af3a8026556de68a93e73766 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Wed Feb 25 15:07:15 2009 +0100 Fix retrieval of numeric and constantid attributes --- bindings/satsolver.i | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/satsolver.i b/bindings/satsolver.i index e69d145..79b7470 100644 --- a/bindings/satsolver.i +++ b/bindings/satsolver.i @@ -201,10 +201,10 @@ dataiterator_value( Dataiterator *di ) case REPOKEY_TYPE_CONSTANT: case REPOKEY_TYPE_NUM: case REPOKEY_TYPE_U32: - value = Swig_Int( di->key->size ); + value = Swig_Int( di->kv.num ); break; case REPOKEY_TYPE_CONSTANTID: - value = Swig_Int( di->key->size ); + value = Swig_String( dep2str( di->repo->pool, di->kv.id ) ); break; case REPOKEY_TYPE_ID: if (di->data && di->data->localpool) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> master : Fix summary
by Klaus Kämpf 25 Feb '09

25 Feb '09

ref: refs/heads/master commit 6dd0d53c04fa6fa523f7a7f8cb7e4efe53a3e56e Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Wed Feb 25 14:12:57 2009 +0100 Fix summary --- tools/susetags2solv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/susetags2solv.c b/tools/susetags2solv.c index e8e36e1..9a0325b 100644 --- a/tools/susetags2solv.c +++ b/tools/susetags2solv.c @@ -27,13 +27,13 @@ static void usage(int status) { fprintf(stderr, "\nUsage:\n" - "susetags2solv [-a][-s][-c <content>][-h]\n" + "susetags2solv [-b <base>][-c <content>][-d <descrdir>][-h][-k][-n <name>]\n" " reads a 'susetags' repository from <stdin> and writes a .solv file to <stdout>\n" + " -b <base>: save as multiple files starting with <base>\n" " -c <contentfile> : parse given contentfile (for product information)\n" " -d <descrdir> : do not read from stdin, but use data in descrdir\n" " -h : print help & exit\n" " -k : don't mix kinds (experimental!)\n" - " -b <base>: save as multiple files starting with <base>\n" " -n <name>: save attributes as <name>.attr\n" ); exit(status); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : build the tests first
by Duncan Mac-Vicar P 25 Feb '09

25 Feb '09

ref: refs/heads/master commit ded93db29c7c3df3d8997d317307eb26f4a6d8e2 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Wed Feb 25 14:00:58 2009 +0100 build the tests first --- libzypp.spec.cmake | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake index 9dcc7ef..f9575bb 100644 --- a/libzypp.spec.cmake +++ b/libzypp.spec.cmake @@ -120,7 +120,10 @@ make -C doc/autodoc %{?jobs:-j %jobs} make -C po %{?jobs:-j %jobs} translations %if 0%{?run_testsuite} - ctest . + make -C tests %{?jobs:-j %jobs} + pushd tests + ctest -A + popd %endif #make check -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0