Skip to content

Minimal backport of https://github.com/DOCGroup/ACE_TAO/pull/2513 #2516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwillemsen merged 1 commit into from
Mar 12, 2026
+8 −8
Merged

Minimal backport of https://github.com/DOCGroup/ACE_TAO/pull/2513 #2516

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ACE/tests/Config_Test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ test_subkey_path (ACE_Configuration* config)
ACE_Configuration_Section_Key testsection;

if (config->open_section (root,
ACE_TEXT ("Software\\ACE\\test"),
ACE_TEXT ("Software\\ACETEST\\test"),
1,
testsection))
return -26;
Expand All @@ -326,7 +326,7 @@ test_subkey_path (ACE_Configuration* config)
return -27;

if (config->remove_section (testsection,
ACE_TEXT ("ACE"),
ACE_TEXT ("ACETEST"),
1))
return -28;

Expand Down Expand Up @@ -527,26 +527,26 @@ run_tests (void)

#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY)
{
ACE_Configuration_Win32Registry RegConfig (HKEY_LOCAL_MACHINE);
ACE_Configuration_Win32Registry RegConfig (HKEY_CURRENT_USER);
int result = test_subkey_path (&RegConfig);
if (result)
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("Win32Registry test HKEY_LOCAL_MACHINE")
ACE_TEXT ("Win32Registry test HKEY_CURRENT_USER")
ACE_TEXT (" failed (%d)\n"), result),
-1);
}
// test win32 registry implementation.
HKEY root =
ACE_Configuration_Win32Registry::resolve_key (HKEY_LOCAL_MACHINE,
ACE_TEXT ("Software\\ACE\\test"));
ACE_Configuration_Win32Registry::resolve_key (HKEY_CURRENT_USER,
ACE_TEXT ("Software\\ACETEST\\test"));
if (!root)
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("resolve_key is broken\n")), -2);

// test resolving of forward slashes
HKEY root_fs =
ACE_Configuration_Win32Registry::resolve_key (HKEY_LOCAL_MACHINE,
ACE_TEXT ("Software/ACE/test"), 0);
ACE_Configuration_Win32Registry::resolve_key (HKEY_CURRENT_USER,
ACE_TEXT ("Software/ACETEST/test"), 0);
if (!root_fs)
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("resolve_key resolving slashes is broken\n")),
Expand Down
Loading