[zypp-commit] r8756 - in /trunk/libzypp/tests: ./ cache/ parser/inifile/ parser/yum/ repo/ repo/susetags/ repo/yum/ zypp/ zypp/base/

15 Feb 2008

Author: dmacvicar
Date: Fri Feb 15 18:08:49 2008
New Revision: 8756

URL: http://svn.opensuse.org/viewcvs/zypp?rev=8756&view=rev
Log:
disable while I fix boost breakage

Added:
    trunk/libzypp/tests/zypp/Signature_test.cc
      - copied, changed from r8755, trunk/libzypp/tests/zypp/Signature.cc
    trunk/libzypp/tests/zypp/TranslatedText_test.cc
      - copied, changed from r8755, trunk/libzypp/tests/zypp/TranslatedText.cc
    trunk/libzypp/tests/zypp/Vendor1_test.cc
      - copied, changed from r8755, trunk/libzypp/tests/zypp/Vendor1.cc
    trunk/libzypp/tests/zypp/Vendor2_test.cc
      - copied, changed from r8755, trunk/libzypp/tests/zypp/Vendor2.cc
Removed:
    trunk/libzypp/tests/zypp/Signature.cc
    trunk/libzypp/tests/zypp/TranslatedText.cc
    trunk/libzypp/tests/zypp/Vendor1.cc
    trunk/libzypp/tests/zypp/Vendor2.cc
Modified:
    trunk/libzypp/tests/CMakeLists.txt
    trunk/libzypp/tests/cache/CMakeLists.txt
    trunk/libzypp/tests/parser/inifile/CMakeLists.txt
    trunk/libzypp/tests/parser/yum/CMakeLists.txt
    trunk/libzypp/tests/repo/CMakeLists.txt
    trunk/libzypp/tests/repo/susetags/CMakeLists.txt
    trunk/libzypp/tests/repo/yum/CMakeLists.txt
    trunk/libzypp/tests/zypp/CMakeLists.txt
    trunk/libzypp/tests/zypp/PoolQuery_test.cc
    trunk/libzypp/tests/zypp/base/CMakeLists.txt
    trunk/libzypp/tests/zypp/base/Sysconfig_test.cc

Modified: trunk/libzypp/tests/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/CMakeLists.txt?rev=8756&r1=8755&r2=8756&view=diff
==============================================================================

--- trunk/libzypp/tests/CMakeLists.txt (original)
+++ trunk/libzypp/tests/CMakeLists.txt Fri Feb 15 18:08:49 2008
@@ -2,8 +2,8 @@
 
 ADD_DEFINITIONS( -DTESTS_SRC_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" )
 
-ADD_SUBDIRECTORY( cache )
+#ADD_SUBDIRECTORY( cache )
 #ADD_SUBDIRECTORY( media )
-ADD_SUBDIRECTORY( zypp )
-ADD_SUBDIRECTORY( parser )
-ADD_SUBDIRECTORY( repo )
+#ADD_SUBDIRECTORY( zypp )
+#ADD_SUBDIRECTORY( parser )
+#ADD_SUBDIRECTORY( repo )

Modified: trunk/libzypp/tests/cache/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CMakeLists.txt?rev=8756&r1=8755&r2=8756&view=diff
==============================================================================
--- trunk/libzypp/tests/cache/CMakeLists.txt (original)
+++ trunk/libzypp/tests/cache/CMakeLists.txt Fri Feb 15 18:08:49 2008
@@ -1,3 +1,5 @@
+ADD_DEFINITIONS( -DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN )
+
 #ADD_EXECUTABLE(CacheInitializer CacheInitializer_test.cc)
 #TARGET_LINK_LIBRARIES(CacheInitializer boost_unit_test_framework )
 #TARGET_LINK_LIBRARIES(CacheInitializer zypp )

Modified: trunk/libzypp/tests/parser/inifile/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/parser/inifile/CMakeLists.txt?rev=8756&r1=8755&r2=8756&view=diff
==============================================================================
--- trunk/libzypp/tests/parser/inifile/CMakeLists.txt (original)
+++ trunk/libzypp/tests/parser/inifile/CMakeLists.txt Fri Feb 15 18:08:49 2008
@@ -1,3 +1,5 @@
+ADD_DEFINITIONS( -DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN )
+
 ADD_EXECUTABLE( inifile iniparser_test.cc )
 TARGET_LINK_LIBRARIES( inifile zypp boost_unit_test_framework )
 
@@ -6,4 +8,4 @@
 ADD_EXECUTABLE( inidict inidict_test.cc )
 TARGET_LINK_LIBRARIES( inidict zypp boost_unit_test_framework )
 
-ADD_TEST(inidict ${CMAKE_CURRENT_BINARY_DIR}/inifile ${CMAKE_CURRENT_SOURCE_DIR}/data )
\ No newline at end of file
+ADD_TEST(inidict ${CMAKE_CURRENT_BINARY_DIR}/inifile ${CMAKE_CURRENT_SOURCE_DIR}/data )

Modified: trunk/libzypp/tests/parser/yum/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/parser/yum/CMakeLists.txt?rev=8756&r1=8755&r2=8756&view=diff
==============================================================================
--- trunk/libzypp/tests/parser/yum/CMakeLists.txt (original)
+++ trunk/libzypp/tests/parser/yum/CMakeLists.txt Fri Feb 15 18:08:49 2008
@@ -1,3 +1,5 @@
+ADD_DEFINITIONS( -DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN )
+
 ADD_EXECUTABLE( RepomdFileReader RepomdFileReader_test.cc )
 TARGET_LINK_LIBRARIES( RepomdFileReader zypp boost_unit_test_framework )
 

Modified: trunk/libzypp/tests/repo/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/CMakeLists.txt?rev=8756&r1=8755&r2=8756&view=diff
==============================================================================
--- trunk/libzypp/tests/repo/CMakeLists.txt (original)
+++ trunk/libzypp/tests/repo/CMakeLists.txt Fri Feb 15 18:08:49 2008
@@ -1,7 +1,9 @@
+ADD_DEFINITIONS( -DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN )
+
 ADD_SUBDIRECTORY( yum )
 ADD_SUBDIRECTORY( susetags )
 
 ADD_EXECUTABLE( RepoVariables RepoVariables_test.cc )
 TARGET_LINK_LIBRARIES( RepoVariables zypp boost_unit_test_framework )
 
-ADD_TEST(RepoVariables ${CMAKE_CURRENT_BINARY_DIR}/RepoVariables ${CMAKE_CURRENT_SOURCE_DIR}/data )
\ No newline at end of file
+ADD_TEST(RepoVariables ${CMAKE_CURRENT_BINARY_DIR}/RepoVariables ${CMAKE_CURRENT_SOURCE_DIR}/data )

Modified: trunk/libzypp/tests/repo/susetags/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/CMakeLists.txt?rev=8756&r1=8755&r2=8756&view=diff
==============================================================================
--- trunk/libzypp/tests/repo/susetags/CMakeLists.txt (original)
+++ trunk/libzypp/tests/repo/susetags/CMakeLists.txt Fri Feb 15 18:08:49 2008
@@ -1,7 +1,9 @@
+ADD_DEFINITIONS( -DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN )
+
 ADD_EXECUTABLE( 
   Downloader
   Downloader_test.cc
 )
 TARGET_LINK_LIBRARIES( Downloader zypp boost_unit_test_framework )
 
-ADD_TEST(Downloader ${CMAKE_CURRENT_BINARY_DIR}/Downloader ${CMAKE_CURRENT_SOURCE_DIR}/data )
\ No newline at end of file
+ADD_TEST(Downloader ${CMAKE_CURRENT_BINARY_DIR}/Downloader ${CMAKE_CURRENT_SOURCE_DIR}/data )

Modified: trunk/libzypp/tests/repo/yum/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/yum/CMakeLists.txt?rev=8756&r1=8755&r2=8756&view=diff
==============================================================================
--- trunk/libzypp/tests/repo/yum/CMakeLists.txt (original)
+++ trunk/libzypp/tests/repo/yum/CMakeLists.txt Fri Feb 15 18:08:49 2008
@@ -1,4 +1,6 @@
+ADD_DEFINITIONS( -DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN )
+
 ADD_EXECUTABLE( YUMDownloader YUMDownloader_test.cc )
 TARGET_LINK_LIBRARIES( YUMDownloader zypp boost_unit_test_framework )
 
-ADD_TEST(YUMDownloader ${CMAKE_CURRENT_BINARY_DIR}/YUMDownloader ${CMAKE_CURRENT_SOURCE_DIR}/data )
\ No newline at end of file
+ADD_TEST(YUMDownloader ${CMAKE_CURRENT_BINARY_DIR}/YUMDownloader ${CMAKE_CURRENT_SOURCE_DIR}/data )

Modified: trunk/libzypp/tests/zypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/CMakeLists.txt?rev=8756&r1=8755&r2=8756&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/CMakeLists.txt (original)
+++ trunk/libzypp/tests/zypp/CMakeLists.txt Fri Feb 15 18:08:49 2008
@@ -3,9 +3,12 @@
 # test:       ${loop_var}_test
 ADD_SUBDIRECTORY(base)
 
-FOREACH( loop_var PoolQuery KeyRing MediaSetAccess ResKind Arch Url Edition Capabilities CheckSum PublicKey PathInfo Digest Fetcher FileChecker RepoManager RepoInfo RepoStatus ProgressData )
+ADD_DEFINITIONS( -DBOOST_TEST_DYN_LINK )
+
+#FOREACH( loop_var Vendor1 Vendor2 TranslatedText PoolQuery KeyRing MediaSetAccess ResKind Arch Url Edition Capabilities CheckSum PublicKey PathInfo Digest Fetcher FileChecker RepoManager RepoInfo RepoStatus ProgressData )
+FOREACH( loop_var PoolQuery )
    ADD_EXECUTABLE( ${loop_var}_test ${loop_var}_test.cc )
-   TARGET_LINK_LIBRARIES( ${loop_var}_test  zypp boost_unit_test_framework )
+   TARGET_LINK_LIBRARIES( ${loop_var}_test  zypp boost_unit_test_framework)
    ADD_TEST( ${loop_var}_test ${CMAKE_CURRENT_BINARY_DIR}/${loop_var}_test)
 ENDFOREACH( loop_var )
 
@@ -18,13 +21,5 @@
 #ADD_EXECUTABLE(Signature Signature.cc)
 #TARGET_LINK_LIBRARIES(Signature zypp boost_unit_test_framework)
 
-ADD_EXECUTABLE(Vendor1 Vendor1.cc)
-TARGET_LINK_LIBRARIES(Vendor1 zypp boost_unit_test_framework )
-
-ADD_EXECUTABLE(Vendor2 Vendor2.cc)
-TARGET_LINK_LIBRARIES(Vendor2 zypp boost_unit_test_framework )
-
 ADD_TEST(PtrTypesTest ${CMAKE_CURRENT_BINARY_DIR}/PtrTypes)
-#ADD_TEST(Signature ${CMAKE_CURRENT_BINARY_DIR}/Signature)
-ADD_TEST(Vendor1Test ${CMAKE_CURRENT_BINARY_DIR}/Vendor1)
-ADD_TEST(Vendor2Test ${CMAKE_CURRENT_BINARY_DIR}/Vendor2)
+

Modified: trunk/libzypp/tests/zypp/PoolQuery_test.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/PoolQuery_test.cc?rev=8756&r1=8755&r2=8756&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/PoolQuery_test.cc (original)
+++ trunk/libzypp/tests/zypp/PoolQuery_test.cc Fri Feb 15 18:08:49 2008
@@ -40,22 +40,15 @@
   cout << "search done." << endl;
 }
 
-test_suite*
-init_unit_test_suite( int argc, char *argv[] )
-{
-//   if (argc < 2)
-//   {
-//     cout << "mediasetaccesstest:"
-//       " path to directory with test data required as parameter" << endl;
-//     return (test_suite *)0;
-//   }
-
-  test_suite* test= BOOST_TEST_SUITE("PoolQuery_test");
-
-  // simple test
-  test->add(BOOST_TEST_CASE(&poolquery_simple_test));
+bool init_function() {
+  framework::master_test_suite().add( BOOST_TEST_CASE( boost::bind( &poolquery_simple_test) ) );
+  return true;
+} 
 
-  return test;
-}
+int
+main( int argc, char* argv[] )
+{
+return ::boost::unit_test::unit_test_main( &init_function, argc, argv );
+} 
 
 // vim: set ts=2 sts=2 sw=2 ai et:

Copied: trunk/libzypp/tests/zypp/Signature_test.cc (from r8755, trunk/libzypp/tests/zypp/Signature.cc)
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Signature_test.cc?p2=trunk/libzypp/tests/zypp/Signature_test.cc&p1=trunk/libzypp/tests/zypp/Signature.cc&r1=8755&r2=8756&rev=8756&view=diff
==============================================================================
    (empty)

Copied: trunk/libzypp/tests/zypp/TranslatedText_test.cc (from r8755, trunk/libzypp/tests/zypp/TranslatedText.cc)
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/TranslatedText_test.cc?p2=trunk/libzypp/tests/zypp/TranslatedText_test.cc&p1=trunk/libzypp/tests/zypp/TranslatedText.cc&r1=8755&r2=8756&rev=8756&view=diff
==============================================================================
    (empty)

Copied: trunk/libzypp/tests/zypp/Vendor1_test.cc (from r8755, trunk/libzypp/tests/zypp/Vendor1.cc)
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Vendor1_test.cc?p2=trunk/libzypp/tests/zypp/Vendor1_test.cc&p1=trunk/libzypp/tests/zypp/Vendor1.cc&r1=8755&r2=8756&rev=8756&view=diff
==============================================================================
    (empty)

Copied: trunk/libzypp/tests/zypp/Vendor2_test.cc (from r8755, trunk/libzypp/tests/zypp/Vendor2.cc)
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Vendor2_test.cc?p2=trunk/libzypp/tests/zypp/Vendor2_test.cc&p1=trunk/libzypp/tests/zypp/Vendor2.cc&r1=8755&r2=8756&rev=8756&view=diff
==============================================================================
    (empty)

Modified: trunk/libzypp/tests/zypp/base/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/base/CMakeLists.txt?rev=8756&r1=8755&r2=8756&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/base/CMakeLists.txt (original)
+++ trunk/libzypp/tests/zypp/base/CMakeLists.txt Fri Feb 15 18:08:49 2008
@@ -1,3 +1,5 @@
+ADD_DEFINITIONS( -DBOOST_TEST_DYN_LINK )
+
 FOREACH(  loop_var Sysconfig )
    ADD_EXECUTABLE( ${loop_var}_test ${loop_var}_test.cc )
    TARGET_LINK_LIBRARIES( ${loop_var}_test  zypp boost_unit_test_framework )

Modified: trunk/libzypp/tests/zypp/base/Sysconfig_test.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/base/Sysconfig_test.cc?rev=8756&r1=8755&r2=8756&view=diff
==============================================================================
--- trunk/libzypp/tests/zypp/base/Sysconfig_test.cc (original)
+++ trunk/libzypp/tests/zypp/base/Sysconfig_test.cc Fri Feb 15 18:08:49 2008
@@ -34,7 +34,7 @@
   BOOST_CHECK_EQUAL( values["NO_PROXY"], "localhost, 127.0.0.1");
 }
 
-test_suite*
+bool
 init_unit_test_suite( int argc, char* argv[] )
 {
   string datadir;
@@ -59,3 +59,14 @@
   return test;
 }
 
+//bool init_function() {
+//  framework::master_test_suite().add( BOOST_TEST_CASE( boost::bind( &poolquery_simple_test) ) );
+//  return true;
+//}
+
+int
+main( int argc, char* argv[] )
+{
+  return ::boost::unit_test::unit_test_main( &init_unit_test_suite, argc, argv );
+}
+

-- 
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org

    

[zypp-commit] r8756 - in /trunk/libzypp/tests: ./ cache/ parser/inifile/ parser/yum/ repo/ repo/susetags/ repo/yum/ zypp/ zypp/base/

dmacvicar＠svn.opensuse.org