diff options
| author | labancap <labancap@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-01-31 18:46:22 +0000 |
|---|---|---|
| committer | labancap <labancap@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-01-31 18:46:22 +0000 |
| commit | 27cba79aae8a36fe44b3013223731092484c84c6 (patch) | |
| tree | 1a8b43e8b9ef8cdc906382c2626beb2d95aba421 | |
| parent | 308e5e5899d38dc9ff6df706d4d2b6a89818f52a (diff) | |
| download | ATCD-27cba79aae8a36fe44b3013223731092484c84c6.tar.gz | |
Corrected test for scoreboard
| -rw-r--r-- | ACE/OCI_RE_ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/tests/Message_Block_Large_Copy_Test.cpp | 38 |
2 files changed, 22 insertions, 24 deletions
diff --git a/ACE/OCI_RE_ChangeLog b/ACE/OCI_RE_ChangeLog index 94e5418095f..40dc0ea90bd 100644 --- a/ACE/OCI_RE_ChangeLog +++ b/ACE/OCI_RE_ChangeLog @@ -1,9 +1,15 @@ +Thu Jan 31 18:41:26 UTC 2013 Phillip LaBanca <labancap@ociweb.com> + + * tests/Message_Block_Large_Copy_Test.cpp: + + Corrected test for scoreboard + Thu Jan 31 14:38:03 UTC 2013 "Kevin Stanley" <stanleyk@ociweb.com> * tests/Message_Block_Large_Copy_Test.cpp: Fixed another error in allocation missed the first time. - + Thu Jan 31 14:31:17 UTC 2013 Kevin Stanley <stanleyk@ociweb.com> * tests/Message_Block_Large_Copy_Test.cpp: diff --git a/ACE/tests/Message_Block_Large_Copy_Test.cpp b/ACE/tests/Message_Block_Large_Copy_Test.cpp index 4c91116851f..a600271273e 100644 --- a/ACE/tests/Message_Block_Large_Copy_Test.cpp +++ b/ACE/tests/Message_Block_Large_Copy_Test.cpp @@ -17,15 +17,11 @@ #include "ace/Message_Block.h" size_t -run_duplicate_test (size_t msg_block_count, size_t msg_block_size) +run_duplicate_test (const size_t msg_block_count, + const char * block, + const size_t msg_block_size) { size_t rc = 0; - char* block = new char[msg_block_size]; - - for(size_t j = 0 ; j != msg_block_size; j++) - block[j] = 'A'; - - block[msg_block_size-1] = 0; ACE_Message_Block* mb_top = new ACE_Message_Block (); ACE_Message_Block* mb = mb_top; @@ -39,7 +35,6 @@ run_duplicate_test (size_t msg_block_count, size_t msg_block_size) } ACE_Message_Block* mb_test = mb_top->duplicate (); - if (mb_test != 0) { rc = mb_test->total_size(); @@ -49,24 +44,17 @@ run_duplicate_test (size_t msg_block_count, size_t msg_block_size) mb_test->total_size(), mb_test->total_length())); mb_test-> release(); - mb_top-> release(); } - - delete block; - + mb_top-> release(); return rc; } size_t -run_clone_test (size_t msg_block_count, size_t msg_block_size) +run_clone_test (const size_t msg_block_count, + const char * block, + const size_t msg_block_size) { size_t rc = 0; - char* block = new char[msg_block_size]; - - for (size_t j = 0 ; j != msg_block_size; j++) - block[j] = 'A'; - - block[msg_block_size-1] = 0; ACE_Message_Block* mb_top = new ACE_Message_Block (); ACE_Message_Block* mb = mb_top; @@ -80,7 +68,6 @@ run_clone_test (size_t msg_block_count, size_t msg_block_size) } ACE_Message_Block* mb_test = mb_top->clone (); - if (mb_test != 0) { rc = mb_test->total_size(); @@ -90,10 +77,8 @@ run_clone_test (size_t msg_block_count, size_t msg_block_size) mb_test->total_size(), mb_test->total_length())); mb_test-> release(); - mb_top-> release(); } - - delete block; + mb_top-> release(); return rc; } @@ -117,8 +102,14 @@ run_main (int , ACE_TCHAR *[]) MSG_BLOCK_SIZE, MSG_BLOCK_TOTAL)); + char block[MSG_BLOCK_SIZE]; + for(size_t j = 0 ; j != MSG_BLOCK_SIZE; j++) + block[j] = 'A'; + block[MSG_BLOCK_SIZE-1] = 0; + size_t duplicate_total = run_duplicate_test ( MSG_BLOCK_COUNT, + block, MSG_BLOCK_SIZE); if (duplicate_total != MSG_BLOCK_TOTAL ) { @@ -130,6 +121,7 @@ run_main (int , ACE_TCHAR *[]) size_t clone_total = run_clone_test ( MSG_BLOCK_COUNT, + block, MSG_BLOCK_SIZE); if (clone_total != MSG_BLOCK_TOTAL ) { |