diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-02 09:01:26 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-02 09:01:26 +0000 |
| commit | 535dce4c42c1680c0b252e1c95c7657d7ee96be6 (patch) | |
| tree | 580a19b9a6e5cefd168b24a83881c37ed0f1ab00 /TAO/tests/RTCORBA | |
| parent | cfc9f81f6d2dd65e0d9f7e90883dc3948eddc817 (diff) | |
| download | ATCD-535dce4c42c1680c0b252e1c95c7657d7ee96be6.tar.gz | |
Mon Jul 2 08:58:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests/RTCORBA')
| -rwxr-xr-x | TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl | 7 | ||||
| -rw-r--r-- | TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp | 7 | ||||
| -rw-r--r-- | TAO/tests/RTCORBA/Diffserv/client.cpp | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl index 4d487e023ab..c8c70d449a1 100755 --- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl +++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl @@ -8,7 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::Run_Test; -my($T) = new PerlACE::Process ("test"); +if (PerlACE::is_vxworks_test()) { +$T = new PerlACE::ProcessVX ("test"); +} +else { +$T = new PerlACE::Process ("test"); +} my($test) = $T->SpawnWaitKill ($PerlACE::wait_interval_for_process_creation); my($status) = 0; diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp index f32e7ebb006..74f91b2ccea 100644 --- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp +++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp @@ -21,15 +21,14 @@ public: }; -int main(int, char**) +int main(int argc, char* argv[]) { try { - int argc = 0; CORBA::ORB_var orb1 = - CORBA::ORB_init(argc, 0, "orb1"); + CORBA::ORB_init(argc, argv, "orb1"); CORBA::ORB_var orb2 = - CORBA::ORB_init(argc, 0, "orb2"); + CORBA::ORB_init(argc, argv, "orb2"); CORBA::Object_var poaObj_var = orb1->resolve_initial_references ("RootPOA"); diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp index 4bda4c70332..32605b96497 100644 --- a/TAO/tests/RTCORBA/Diffserv/client.cpp +++ b/TAO/tests/RTCORBA/Diffserv/client.cpp @@ -34,7 +34,7 @@ change_network_priority (int enable_network_priority, RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()); - // Set the tcp protocol protperties + // Set the tcp protocol properties RTCORBA::TCPProtocolProperties_var tcp_properties = rt_orb->create_tcp_protocol_properties (ACE_DEFAULT_MAX_SOCKET_BUFSIZ, ACE_DEFAULT_MAX_SOCKET_BUFSIZ, |