diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2010-07-20 15:13:59 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2010-07-20 15:13:59 +0000 |
| commit | cbbed24ab6f47a0f30234180be2db23faae1bf95 (patch) | |
| tree | 265c433776cf0826d87591459ae4a0339ef7e0b1 /ACE | |
| parent | 72343e4fb6d71ecc064850f5626f659d80ce84ab (diff) | |
| download | ATCD-cbbed24ab6f47a0f30234180be2db23faae1bf95.tar.gz | |
Tue Jul 20 15:08:49 UTC 2010 Phil Mesnier <mesnier_p@ociweb.com>
* tests/Bug_3319_Regression_Test.cpp:
Fix the test to be consistent with revised service config
behavior. The test had assumed that ACE_Service_Config::open()
would return 0 even if svc.conf were not present, but since it
was setting the ignore_default_svc_conf_file to 0, the restore
behavior of the service configurator is to fail with ENOENT in
that case.
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/tests/Bug_3319_Regression_Test.cpp | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 81506ba57c8..06f09e13046 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Tue Jul 20 15:08:49 UTC 2010 Phil Mesnier <mesnier_p@ociweb.com> + + * tests/Bug_3319_Regression_Test.cpp: + + Fix the test to be consistent with revised service config + behavior. The test had assumed that ACE_Service_Config::open() + would return 0 even if svc.conf were not present, but since it + was setting the ignore_default_svc_conf_file to 0, the restore + behavior of the service configurator is to fail with ENOENT in + that case. + Tue Jul 20 08:48:00 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> * ace/TSS_T.cpp: diff --git a/ACE/tests/Bug_3319_Regression_Test.cpp b/ACE/tests/Bug_3319_Regression_Test.cpp index a4034106951..d5d1a7292c8 100644 --- a/ACE/tests/Bug_3319_Regression_Test.cpp +++ b/ACE/tests/Bug_3319_Regression_Test.cpp @@ -27,7 +27,7 @@ run_main (int, ACE_TCHAR *[]) args.add (ACE_TEXT("MyProgram"), true); int ret = ACE_Service_Config::open(args.argc(), args.argv(), ACE_DEFAULT_LOGGER_KEY, - 1, 0, 1); + 1, 1, 1); if (ACE_OS::strcmp (log_msg->program_name (), ACE_TEXT("MyProgram")) != 0) { |