diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-06-12 16:50:36 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-06-12 16:50:36 +0000 |
| commit | 6bcf7829725235551e9ec2cf87d615dda3fad35c (patch) | |
| tree | 2546aeb932f208a39f9f6f3d88a5d384b4bd065b | |
| parent | 264dc2df7afacacdb9687033c1742103e2234630 (diff) | |
| download | ATCD-6bcf7829725235551e9ec2cf87d615dda3fad35c.tar.gz | |
ChangeLogTag:Mon
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tests/SV_Shared_Memory_Test.cpp | 16 |
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 388d8f41d2f..8a4cd65eb09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 12 16:48:19 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * tests/SV_Shared_Memory_Test.cpp (run_main): Moved a couple of + calls outside of ACE_ASSERT since they don't belong in there. + Mon Jun 12 14:34:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_sys_stat.h: diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp index 55770a532dd..f8351395346 100644 --- a/tests/SV_Shared_Memory_Test.cpp +++ b/tests/SV_Shared_Memory_Test.cpp @@ -154,14 +154,18 @@ run_main (int, ACE_TCHAR *[]) // This semaphore is initially created with a count of 0, i.e., it // is "locked." - ACE_ASSERT (parent_mutex->open (SEM_KEY_1, - ACE_SV_Semaphore_Complex::ACE_CREATE, - 0) != -1); + int result = parent_mutex->open (SEM_KEY_1, + ACE_SV_Semaphore_Complex::ACE_CREATE, + 0); + ACE_ASSERT (result != -1); + // This semaphore is initially created with a count of 0, i.e., it // is "locked." - ACE_ASSERT (parent_synch->open (SEM_KEY_2, - ACE_SV_Semaphore_Complex::ACE_CREATE, - 0) != -1); + result = parent_synch->open (SEM_KEY_2, + ACE_SV_Semaphore_Complex::ACE_CREATE, + 0); + ACE_ASSERT (result != -1); + switch (ACE_OS::fork (ACE_TEXT ("SV_Shared_Memory_Test.cpp"))) { case -1: |