diff options
| author | Wilhelm Pflueger <Wilhelm.Pflueger@web.de> | 2011-03-21 14:13:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-21 14:13:51 +0000 |
| commit | c97a89f8be34e3d9f47363435d0e4073201d8dc3 (patch) | |
| tree | c4cb744ab52480cd22339ac965658d981913f780 /sal/qa/osl/socket/osl_ConnectorSocket.cxx | |
| parent | 5e41374388e05a605af223421c19dfa86383e911 (diff) | |
Reanimated tests in ure/sal/qa/osl/socket
I had to deactivate the tests in osl_SocketAddr.cxx
and osl_Socket2.cxx in makefile.mk. These tests failed:
osl_SocketAddr.cxx (SHL5TARGET) caused Segmentation fault.
osl_Socket2.cxx (SHL6TARGET) just failed with error 1.
I added the option SILENT_TEST in osl_Socket.cxx and in
sockethelper.hxx to allow tests without output
(t_print disabled).
Diffstat (limited to 'sal/qa/osl/socket/osl_ConnectorSocket.cxx')
| -rw-r--r-- | sal/qa/osl/socket/osl_ConnectorSocket.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx index 1e03418104e8..bf47ea327928 100644 --- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx +++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx @@ -59,7 +59,9 @@ // include files //------------------------------------------------------------------------ -#include <testshl/simpleheader.hxx> +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> #include "osl_Socket_Const.h" #include "sockethelper.hxx" @@ -253,8 +255,8 @@ namespace osl_ConnectorSocket // ----------------------------------------------------------------------------- -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::ctors, "osl_ConnectorSocket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::connect, "osl_ConnectorSocket"); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::ctors); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::connect); } // namespace osl_ConnectorSocket @@ -262,6 +264,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::connect, "osl_Connect // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |