summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2022-11-02 14:21:21 +0100
committerGitHub <noreply@github.com>2022-11-02 14:21:21 +0100
commit8df584a9bfa3651f69ac3ba8e2d0dbda09355797 (patch)
treef4daedfde6fab1309a5ae0d394575ee0ea348751
parent37ebf54fdcdbeff21db614a85c368bf461df107e (diff)
parenta61fa263db13c5cf6e49a469d06d789a35bcce5e (diff)
downloadATCD-8df584a9bfa3651f69ac3ba8e2d0dbda09355797.tar.gz
Merge pull request #1977 from jwillemsen/jwi-processenv
The environment variable set is Z, not ZZ
-rw-r--r--ACE/tests/Process_Env_Test.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/ACE/tests/Process_Env_Test.cpp b/ACE/tests/Process_Env_Test.cpp
index 559ef8fef19..a7107a0fbec 100644
--- a/ACE/tests/Process_Env_Test.cpp
+++ b/ACE/tests/Process_Env_Test.cpp
@@ -14,9 +14,8 @@
#include "ace/Process.h"
#include "ace/SString.h"
-using setenvfn_t = void (*)(const ACE_TCHAR *, const ACE_TCHAR *, void *);
-
#if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE)
+using setenvfn_t = void (*)(const ACE_TCHAR *, const ACE_TCHAR *, void *);
void create_large_env (setenvfn_t setenv, void *ctx)
{
@@ -100,7 +99,7 @@ run_main (int, ACE_TCHAR*[])
128 * 1024);
create_large_env (thisproc_setenv, 0);
opts2.enable_unicode_environment ();
- opts2.setenv (ACE_TEXT ("ZZ"), ACE_TEXT ("1"));
+ opts2.setenv (ACE_TEXT ("Z"), ACE_TEXT ("1"));
opts2.command_line (ACE_TEXT ("cmd.exe /d /c ")
ACE_TEXT ("\"if defined Z (exit 1) else (exit 2)\""));
ACE_Process process2;