diff options
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tests/Big_Reply/client.cpp | 14 | ||||
| -rwxr-xr-x | TAO/tests/Big_Reply/run_test.pl | 2 | ||||
| -rw-r--r-- | TAO/tests/CodeSets/simple/client.cpp | 2 |
4 files changed, 22 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 46a735a2e52..615e4dfb043 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Mon Oct 6 14:30:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Big_Reply/client.cpp + * tests/Big_Reply/run_test.pl + Only do a shutdown of the server when -x is specified + + * tests/CodeSets/simple/client.cpp + ACE_TCHAR fixes + Mon Oct 6 14:14:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * TAO_IDL/driver/drv_preproc.cpp diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp index 0c363ca2de4..a0a9b5ce3a4 100644 --- a/TAO/tests/Big_Reply/client.cpp +++ b/TAO/tests/Big_Reply/client.cpp @@ -3,9 +3,10 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Muxing, client, "$Id$") +ACE_RCSID(Big_Reply, client, "$Id$") const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); +bool server_shutdown = false; int parse_args (int argc, ACE_TCHAR *argv[]) @@ -19,11 +20,15 @@ parse_args (int argc, ACE_TCHAR *argv[]) case 'k': ior = get_opts.opt_arg (); break; + case 'x': + server_shutdown = true; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " "-k <ior>" + "-x shutdown" "\n", argv [0]), -1); @@ -69,8 +74,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Got all the replies...\n")); - // Request the server to shutdown - reply_gen->shutdown (); + if (server_shutdown) + { + // Request the server to shutdown + reply_gen->shutdown (); + } orb->destroy (); } diff --git a/TAO/tests/Big_Reply/run_test.pl b/TAO/tests/Big_Reply/run_test.pl index 08dda9e8104..202e3947e74 100755 --- a/TAO/tests/Big_Reply/run_test.pl +++ b/TAO/tests/Big_Reply/run_test.pl @@ -18,7 +18,7 @@ if (PerlACE::is_vxworks_test()) { else { $SV = new PerlACE::Process ("server", "-o $iorfile"); } -$CL = new PerlACE::Process ("client", " -k file://$iorfile"); +$CL = new PerlACE::Process ("client", " -k file://$iorfile -x"); $server = $SV->Spawn (); diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp index f7f60ce631e..8cba0ab9289 100644 --- a/TAO/tests/CodeSets/simple/client.cpp +++ b/TAO/tests/CodeSets/simple/client.cpp @@ -109,7 +109,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ++error_count; } #if defined (ACE_HAS_WCHAR) - wchar_t *wide_string = ACE_OS::strdup(ACE_TEXT_ALWAYS_WCHAR ("Wide String")); + wchar_t *wide_string = ACE_OS::strdup(ACE_TEXT ("Wide String")); wchar_t *wide_reply = server->op2 (wide_string); ACE_DEBUG ((LM_DEBUG, "sent %W, got %W\n", wide_string, wide_reply)); |