diff options
| -rw-r--r-- | tests/Pipe_Test.cpp | 4 | ||||
| -rw-r--r-- | tests/Process_Mutex_Test.cpp | 8 | ||||
| -rw-r--r-- | tests/Process_Strategy_Test.cpp | 4 | ||||
| -rw-r--r-- | tests/Time_Service_Test.cpp | 14 | ||||
| -rw-r--r-- | tests/Tokens_Test.cpp | 15 |
5 files changed, 23 insertions, 22 deletions
diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index e8b16f33200..8a9da99747a 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -98,9 +98,9 @@ main (int argc, char *argv[]) ACE_Process_Options options; if (close_pipe == 0) - options.command_line ("Pipe_Test" ACE_PLATFORM_EXE_SUFFIX " -c -d"); + options.command_line (__TEXT ("Pipe_Test") ACE_PLATFORM_EXE_SUFFIX __TEXT (" -c -d")); else - options.command_line ("Pipe_Test" ACE_PLATFORM_EXE_SUFFIX " -c"); + options.command_line (__TEXT ("Pipe_Test") ACE_PLATFORM_EXE_SUFFIX __TEXT (" -c")); for (int i = 0; i < ::iterations; i++) { diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp index f061d57b9b8..ef8ab86a6c1 100644 --- a/tests/Process_Mutex_Test.cpp +++ b/tests/Process_Mutex_Test.cpp @@ -99,11 +99,11 @@ main (int argc, char *argv[]) ACE_Process_Options options; if (release_mutex == 0) - options.command_line ("Process_Mutex_Test" ACE_PLATFORM_EXE_SUFFIX - " -c -n %s -d", mutex_name); + options.command_line (__TEXT ("Process_Mutex_Test") ACE_PLATFORM_EXE_SUFFIX + __TEXT (" -c -n %s -d"), ACE_WIDE_STRING (mutex_name)); else - options.command_line ("Process_Mutex_Test" ACE_PLATFORM_EXE_SUFFIX - " -c -n %s", mutex_name); + options.command_line (__TEXT ("Process_Mutex_Test") ACE_PLATFORM_EXE_SUFFIX + __TEXT (" -c -n %s"), ACE_WIDE_STRING (mutex_name)); // Spawn ACE_MAX_PROCESSES processes that will contend for the // lock. diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp index a47014d44a8..706cb8de5c3 100644 --- a/tests/Process_Strategy_Test.cpp +++ b/tests/Process_Strategy_Test.cpp @@ -175,7 +175,7 @@ Options::parse_args (int argc, char *argv[]) { ACE_Get_Opt get_opt (argc, argv, "p:c:f:"); - this->filename_ = ACE_TEMP_FILE_NAME; + this->filename_ = ACE_TEMP_FILE_NAME_A; for (int c; (c = get_opt ()) != -1; ) switch (c) @@ -202,7 +202,7 @@ Options::parse_args (int argc, char *argv[]) } // Initialize the file lock. - if (this->file_lock_.open (this->filename_, + if (this->file_lock_.open (ACE_WIDE_STRING (this->filename_), O_RDWR | O_CREAT, ACE_DEFAULT_FILE_PERMS) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1); diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp index d58b00d95cb..dd9a689d291 100644 --- a/tests/Time_Service_Test.cpp +++ b/tests/Time_Service_Test.cpp @@ -27,11 +27,11 @@ #include "ace/Process.h" #define APPLICATION \ -".." ACE_DIRECTORY_SEPARATOR_STR_A \ -"netsvcs" ACE_DIRECTORY_SEPARATOR_STR_A \ -"servers" ACE_DIRECTORY_SEPARATOR_STR_A \ -"main" ACE_PLATFORM_EXE_SUFFIX \ -" -f " ACE_PLATFORM +__TEXT ("..") ACE_DIRECTORY_SEPARATOR_STR \ +__TEXT ("netsvcs") ACE_DIRECTORY_SEPARATOR_STR \ +__TEXT ("servers") ACE_DIRECTORY_SEPARATOR_STR \ +__TEXT ("main") ACE_PLATFORM_EXE_SUFFIX \ +__TEXT (" -f ") ACE_PLATFORM int main (int, char *[]) @@ -46,7 +46,7 @@ main (int, char *[]) ACE_OS::unlink (ACE_DEFAULT_BACKING_STORE); ACE_Process_Options server_options; - server_options.command_line (APPLICATION "server.conf"); + server_options.command_line (APPLICATION __TEXT ("server.conf")); ACE_Process server; if (server.spawn (server_options) == -1) @@ -57,7 +57,7 @@ main (int, char *[]) ACE_OS::sleep (3); ACE_Process_Options clerk_options; - clerk_options.command_line (APPLICATION "clerk.conf"); + clerk_options.command_line (APPLICATION __TEXT ("clerk.conf")); ACE_Process clerk; if (clerk.spawn (clerk_options) == -1) diff --git a/tests/Tokens_Test.cpp b/tests/Tokens_Test.cpp index 6bf5064555d..90c939ba79f 100644 --- a/tests/Tokens_Test.cpp +++ b/tests/Tokens_Test.cpp @@ -186,17 +186,18 @@ main (int, char *[]) run_test (A,B,R,W); - const char *cl = - ".." ACE_DIRECTORY_SEPARATOR_STR_A - "netsvcs" ACE_DIRECTORY_SEPARATOR_STR_A - "servers" ACE_DIRECTORY_SEPARATOR_STR_A - "main" ACE_PLATFORM_EXE_SUFFIX - " -f " ACE_PLATFORM "tokens.conf"; + LPCTSTR cl = + __TEXT ("..") ACE_DIRECTORY_SEPARATOR_STR + __TEXT ("netsvcs") ACE_DIRECTORY_SEPARATOR_STR + __TEXT ("servers") ACE_DIRECTORY_SEPARATOR_STR + __TEXT ("main") ACE_PLATFORM_EXE_SUFFIX + __TEXT (" -f ") ACE_PLATFORM + __TEXT ("tokens.conf"); ACE_Process_Options options; options.command_line (cl); - ACE_DEBUG ((LM_DEBUG, "Forking %s.\n", cl)); + ACE_DEBUG ((LM_DEBUG, "Forking Token Service.\n")); // Start up the token server. ACE_Process new_process; |