diff options
| author | Simon McQueen <simon.mcqueen@gmail.com> | 2006-11-07 10:42:17 +0000 |
|---|---|---|
| committer | Simon McQueen <simon.mcqueen@gmail.com> | 2006-11-07 10:42:17 +0000 |
| commit | f96f19420a99a81de44d01142ddfadeae37bed28 (patch) | |
| tree | 4118c01912d29798c1befb89e809a5900d5ed772 | |
| parent | 872e8233134d446487509ec57f0c6979e59f6226 (diff) | |
| download | ATCD-f96f19420a99a81de44d01142ddfadeae37bed28.tar.gz | |
ChangeLogTag: Tue Nov 7 10:38:25 UTC 2006 Simon McQueen <sm@prismtech.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/tests/Naming_Test.cpp | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6985a856c30..845f371a898 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Tue Nov 7 10:38:25 UTC 2006 Simon McQueen <sm@prismtech.com> + + * tests/Naming_Test.cpp: + + Moved an ::open out of an ACE_ASSERT. It wasn't getting performed on + some builds. + Tue Nov 7 09:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * performance-tests/Misc/basic_func.{h,cpp}: diff --git a/ACE/tests/Naming_Test.cpp b/ACE/tests/Naming_Test.cpp index fc752dcac43..28db1fde02a 100644 --- a/ACE/tests/Naming_Test.cpp +++ b/ACE/tests/Naming_Test.cpp @@ -234,7 +234,12 @@ run_main (int argc, ACE_TCHAR *argv[]) name_options->database (ACE_OS::mktemp (temp_file)); } - ACE_ASSERT (ns_context->open (ACE_Naming_Context::PROC_LOCAL, 1) != -1); + if (ns_context->open (ACE_Naming_Context::PROC_LOCAL, 1) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "ERROR: Naming_Test - ns_context->open () failed.\n"), + -1); + } ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("time to test %d iterations using %s\n"), ACE_NS_MAX_ENTRIES, name_options->use_registry () ? |