Re: [Boost-users] Boost Unit Testing of DLL's

newer
[boost] [review] Heaps

older
Is boost test thread-safe?

Gennadiy Rozental

28 May 2011 28 May '11

6:05 a.m.

Tyler Weston writes:

...

If you add a "delay load" flag for the boost UTF DLL, you should be able to ship testing code in your DLL without providing the UTF DLL to customers. This instructs the compiler to only look for the UTF DLL when the testing framework attempts to make a call. As long as your users don't try to call your test hooks, it should work out. http://msdn.microsoft.com/en-us/library/yx9zd12s%28v=VS.90%29.aspx

This will not work if OP using auto test cases. These are generated at startup and will require UTF dll. Gennadiy

Show replies by date

Johan Doré

30 May 30 May

1:23 p.m.

New subject: Boost Unit Testing of DLL's

Hi, Based on the answers which clearly stated that it would not work with delay loading the UTF DLL I tried to modify the Boost UTF implementation to get it working. The code you see below is probably not following the Boost guidelines but it made it possible for us to use the UTF with delay loading of the UTF dll. CHANGES APPLIED TO boost_1_46_1\boost\config\auto_link.hpp: ////////////////////////////////////////////////////////// // Original implementation ////////////////////////////////////////////////////////// #ifdef BOOST_AUTO_LINK_TAGGED # pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib") # ifdef BOOST_LIB_DIAGNOSTIC # pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib") # endif #elif defined(BOOST_AUTO_LINK_NOMANGLE) # pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib") # ifdef BOOST_LIB_DIAGNOSTIC # pragma message ("Linking to lib file: " BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib") # endif #else # pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib") # ifdef BOOST_LIB_DIAGNOSTIC # pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib") # endif #endif ////////////////////////////////////////////////////////// // Modified implementation // We need a function which can check if the UTF lib // functionality can be used this is implemented in the // new function HasBoostLib ////////////////////////////////////////////////////////// #ifdef BOOST_AUTO_LINK_TAGGED # define BOOST_LIB_PATH BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT #elif defined(BOOST_AUTO_LINK_NOMANGLE) # define BOOST_LIB_PATH BOOST_STRINGIZE(BOOST_LIB_NAME) #else # define BOOST_LIB_PATH BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION #endif # pragma comment(lib, BOOST_LIB_PATH ".lib") # ifdef BOOST_LIB_DIAGNOSTIC # pragma message ("Linking to lib file: " BOOST_LIB_PATH ".lib") # endif static bool HasBoostLib() { #ifdef BOOST_DYN_LINK static bool Available = LoadLibrary(BOOST_LIB_PATH ".dll") != NULL; return(Available); #else return(true); #endif } CHANGES APPLIED TO boost_1_46_1\boost\unit_test.hpp: ////////////////////////////////////////////////////////// // Original implementation ////////////////////////////////////////////////////////// #include #include #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_TEST_NO_LIB) && \ !defined(BOOST_TEST_SOURCE) && !defined(BOOST_TEST_INCLUDED) # define BOOST_LIB_NAME boost_unit_test_framework # if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_TEST_DYN_LINK) # define BOOST_DYN_LINK # endif # include #endif // auto-linking disabled ////////////////////////////////////////////////////////// // Modified implementation // We need to include the auto_link.hpp before headers // using the HasBoostLib function ////////////////////////////////////////////////////////// #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_TEST_NO_LIB) && \ !defined(BOOST_TEST_SOURCE) && !defined(BOOST_TEST_INCLUDED) # define BOOST_LIB_NAME boost_unit_test_framework # if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_TEST_DYN_LINK) # define BOOST_DYN_LINK # endif # include #endif // auto-linking disabled #include #include CHANGES APPLIED TO boost_1_46_1\boost\test\utils\trivial_singleton.hpp ////////////////////////////////////////////////////////// // Original implementation ////////////////////////////////////////////////////////// #define BOOST_TEST_SINGLETON_INST( inst ) \ namespace { BOOST_JOIN( inst, _t)& inst = BOOST_JOIN( inst, _t)::instance()} ////////////////////////////////////////////////////////// // Modified implementation // We shall not instantiate the singleton if the lib is // not available ////////////////////////////////////////////////////////// #define BOOST_TEST_SINGLETON_INST( inst ) \ namespace { BOOST_JOIN( inst, _t)& inst = HasBoostLib() ? BOOST_JOIN( inst, _t)::instance() : *(BOOST_JOIN( inst, _t)*)NULL; } CHANGES APPLIED TO boost_1_46_1\boost\test\unit_test_suite_impl.hpp ////////////////////////////////////////////////////////// // Original implementation ////////////////////////////////////////////////////////// inline test_case* make_test_case( callback0<> const& test_func, const_string tc_name ) { return new test_case( ut_detail::normalize_test_case_name( tc_name ), test_func ); } template inline test_case* make_test_case( void (UserTestCase::* test_method )(), const_string tc_name, boost::shared_ptr<InstanceType> user_test_case ) { return new test_case( ut_detail::normalize_test_case_name( tc_name ), ut_detail::user_tc_method_invoker( user_test_case, test_method ) ); } struct BOOST_TEST_DECL auto_test_unit_registrar { // Constructors auto_test_unit_registrar( test_case* tc, counter_t exp_fail ); explicit auto_test_unit_registrar( const_string ts_name ); explicit auto_test_unit_registrar( test_unit_generator const& tc_gen ); explicit auto_test_unit_registrar( int ); private: static std::list& curr_ts_store(); }; ////////////////////////////////////////////////////////// // Modified implementation // We shall not instantiate test_case nor // auto_test_unit_registrar if the Lib is not available ////////////////////////////////////////////////////////// inline test_case* make_test_case( callback0<> const& test_func, const_string tc_name ) { if(HasBoostLib()) return new test_case( ut_detail::normalize_test_case_name( tc_name ), test_func ); return(NULL); } template inline test_case* make_test_case( void (UserTestCase::* test_method )(), const_string tc_name, boost::shared_ptr<InstanceType> user_test_case ) { if(HasBoostLib()) return new test_case( ut_detail::normalize_test_case_name( tc_name ), ut_detail::user_tc_method_invoker( user_test_case, test_method ) ); return(NULL); } namespace ut_detail { struct BOOST_TEST_DECL auto_test_unit_registrar { // Constructors auto_test_unit_registrar( test_case* tc, counter_t exp_fail ); explicit auto_test_unit_registrar( const_string ts_name ) ; explicit auto_test_unit_registrar( test_unit_generator const& tc_gen ); explicit auto_test_unit_registrar( int ) ; private: static std::list& curr_ts_store(); }; ///////////////////////////////////////////////////////////////////////// // auto_test_unit_registrar implementation which can be instantiated // even if the Boost UTF DLL is not available. // Test functionalities will probably crash if the DLL is not available // but not UTF code will work ///////////////////////////////////////////////////////////////////////// class CDynamic_auto_test_unit_registrar { public: // Constructors CDynamic_auto_test_unit_registrar( test_case* tc, counter_t exp_fail ) { Registrar = HasBoostLib() ? new auto_test_unit_registrar(tc, exp_fail) : NULL; }; CDynamic_auto_test_unit_registrar( const_string ts_name ) { Registrar = HasBoostLib() ? new auto_test_unit_registrar(ts_name) : NULL; } CDynamic_auto_test_unit_registrar( test_unit_generator const& tc_gen ) { Registrar = HasBoostLib() ? new auto_test_unit_registrar(tc_gen) : NULL; } CDynamic_auto_test_unit_registrar( int Val) { Registrar = HasBoostLib() ? new auto_test_unit_registrar(Val) :NULL; } ~CDynamic_auto_test_unit_registrar() { delete Registrar; Registrar = NULL; } private: auto_test_unit_registrar* Registrar; }; CHANGES APPLIED TO boost_1_46_1\boost\test\unit_test_suite.hpp ////////////////////////////////////////////////////////// // Original implementation ////////////////////////////////////////////////////////// #define BOOST_AUTO_TU_REGISTRAR( test_name ) \ static boost::unit_test::ut_detail::auto_test_unit_registrar BOOST_JOIN( BOOST_JOIN( test_name, _registrar ), __LINE__ ) ////////////////////////////////////////////////////////// // Modified implementation // Instantiate the CDynamic_auto_test_unit_registrar // instead of the auto_test_unit_registrar ////////////////////////////////////////////////////////// #define BOOST_AUTO_TU_REGISTRAR( test_name ) \ static boost::unit_test::ut_detail::CDynamic_auto_test_unit_registrar BOOST_JOIN( BOOST_JOIN( test_name, _registrar ), __LINE__ ) That is all it required to work in our setup. Best regards Johan Doré

Gennadiy Rozental

31 May 31 May

3:52 a.m.

New subject: Boost Unit Testing of DLL's

Johan Doré writes:

...

Hi, Based on the answers which clearly stated that it would not work with delay

loading the UTF DLL I tried to modify the Boost UTF implementation to get it working.

...

The code you see below is probably not following the Boost guidelines but it made it possible for us to use the UTF with delay loading of the UTF dll.

Johan Doré

9:09 a.m.

New subject: Boost Unit Testing of DLL's

Dear Gennadiy I just uploaded the code in case someone was interested in seeing a possible workaround, and I wasn't expecting it to be added to the native Boost UTF. In addition if Lazy/Delay loading is ever going to be supported in the "real" Boost UTF it would require much more than what I uploaded in the previous mail. I agree that we could just ship the required UTF DLL. Personally I do however prefer to ship only what is needed and with the above implementation we save some overhead on initializing the UTF when it is not needed. Best regards Johan -----Original Message----- From: boost-users-bounces@lists.boost.org [mailto:boost-users-bounces@lists.boost.org] On Behalf Of Gennadiy Rozental Sent: 31. maj 2011 05:53 To: boost-users@lists.boost.org Subject: Re: [Boost-users] Boost Unit Testing of DLL's Johan Doré writes:

...

Hi, Based on the answers which clearly stated that it would not work with delay

loading the UTF DLL I tried to modify the Boost UTF implementation to get it working.

...

The code you see below is probably not following the Boost guidelines but it made it possible for us to use the UTF with delay loading of the UTF dll.

These are massive changes. You can submit a new ticket with a patch. I'll consider it, but I must say I am still not convinced that the problem warrants any action. Why can't you just ship it with UTF dll? Gennadiy _______________________________________________ Boost-users mailing list Boost-users@lists.boost.org http://lists.boost.org/mailman/listinfo.cgi/boost-users

5016

Age (days ago)

5019

Last active (days ago)

List overview

Download

3 comments

2 participants

participants (2)

Gennadiy Rozental
Johan Doré