mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-06 05:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

2008-06-16 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

Browse source 
Applied Ross's aria2-0.13.2+1-mingw-4.patch. In this commit, 
only the
	follow sources are applied.
	* src/Platform.h: I removed HAVE_WINSOCK2_H directive from 
Platform.h.
	* src/Platform.cc: Moved common setup/teardown code to Platform 
class.
	I moved #endif // HAVE_WINSOCK2_H to the front of #include 
"DlAbortEx.h"
	I included locale.h from Platform.cc.
	* src/main.cc: Moved common setup/teardown code to Platform 
class.
	* test/AllTest.cc: Use Platform class.
	Set locale to C in AllTest.cc to prevent the messages to be 
localized.
This commit is contained in:
Tatsuhiro Tsujikawa 2008-06-16 11:59:34 +00:00
parent 06644332c2
commit aaa2ecaa6f
5 changed files with 105 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

29
test/AllTest.cc
View file

@ -1,20 +1,22 @@
#include "Platform.h"
#include "CookieBoxFactory.h"
#include <iostream>
#include <cppunit/CompilerOutputter.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/ui/text/TestRunner.h>
#ifdef HAVE_LIBSSL
# include <openssl/err.h>
# include <openssl/ssl.h>
#endif // HAVE_LIBSSL
#ifdef HAVE_LIBGNUTLS
# include <gnutls/gnutls.h>
#endif // HAVE_LIBGNUTLS
using aria2::SharedHandle;
using aria2::SingletonHolder;
int main(int argc, char* argv[]) {
aria2::Platform platform;
#ifdef ENABLE_NLS
// Set locale to C to prevent the messages to be localized.
setlocale (LC_CTYPE, "C");
setlocale (LC_MESSAGES, "C");
#endif // ENABLE_NLS
CppUnit::Test* suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
CppUnit::TextUi::TestRunner runner;
runner.addTest(suite);
@ -23,15 +25,6 @@ int main(int argc, char* argv[]) {
// setup
#ifdef HAVE_LIBSSL
// for SSL initialization
SSL_load_error_strings();
SSL_library_init();
#endif // HAVE_LIBSSL
#ifdef HAVE_LIBGNUTLS
gnutls_global_init();
#endif // HAVE_LIBGNUTLS
SharedHandle<aria2::CookieBoxFactory> cookieBoxFactory
(new aria2::CookieBoxFactory());
SingletonHolder<SharedHandle<aria2::CookieBoxFactory> >::instance(cookieBoxFactory);
@ -39,9 +32,5 @@ int main(int argc, char* argv[]) {
// Run the tests.
bool successfull = runner.run();
#ifdef HAVE_LIBGNUTLS
gnutls_global_deinit();
#endif // HAVE_LIBGNUTLS
return successfull ? 0 : 1;
}