diff options
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/tests/OS_Test.cpp | 35 |
2 files changed, 5 insertions, 35 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 81ba72c9eab..046ee31f5fb 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Sat Oct 17 07:32:19 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/OS_Test.cpp: + Removed getmacaddress test, that moved to its own test + Fri Oct 16 08:51:19 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * bin/generate_doxygen.pl: diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index e0028baeb4c..4f0fb95090d 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -1138,38 +1138,6 @@ ace_ctype_test (void) } int -getmacaddress_test (void) -{ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing getmacaddress\n"))); - -#if defined (ACE_LACKS_NETWORKING) - return 0; -#else /* ACE_LACKS_NETWORKING */ - struct ACE_OS::macaddr_node_t node; - - ACE_OS::memset (&node, 0x0, sizeof (node)); - int retval = ACE_OS::getmacaddress (&node); - if (retval == 0) - { - if (node.node[0] == 0x0 && node.node[1] == 0x0 && node.node[2] == 0x0 && - node.node[3] == 0x0 && node.node[4] == 0x0 && node.node[5] == 0x0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_OS::getmacaddress() failed to get MAC address\n"))); - ++retval; - } - } - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ACE_OS::getmacaddress() returned %d, should be 0\n"), - retval)); - } - return retval; -#endif /* ACE_LACKS_NETWORKING */ -} - -int ceil_test (void) { ACE_DEBUG ((LM_DEBUG, @@ -1293,9 +1261,6 @@ run_main (int, ACE_TCHAR *[]) if ((result = ace_ctype_test ()) != 0) status = result; - if ((result = getmacaddress_test ()) != 0) - status = result; - ACE_END_TEST; return status; } |